Re: svn commit: r718501 - /cayenne/main/trunk/framework/cayenne-jdk1.5-unpublished/src/test/java/org/apache/cayenne/access/HorizontalInheritanceTest.java

From: Kevin Menard (nirvdru..mail.com)
Date: Tue Nov 18 2008 - 08:32:39 EST

  • Next message: Kevin Menard: "Re: CAY-1077"

    I think you mean leads people to hold off on pushing until ready to
    go. You should be committing as often as you need to. In this
    regard, I think git has a major win over SVN. I think people hold off
    committing to SVN because they know it's going to be shared
    immediately. Granted, a branch probably should be used in that case,
    but branching in SVN is a bit of a chore.

    What we do is branch for everything. If the fix takes less than a day
    or so, the branch is kept local and then merged with master when
    ready. If it takes longer than that or requires two people to look
    at, we push it out to a remote branch. We do use GitHub with private
    repos for this. Since Cayenne is OSS, setting up a fork that you can
    push remote branches to should not be a problem.

    When all done, we merge into master and destroy the remote branch.
    There's no real reason to keep it around since git merges history as
    well.

    -- 
    Kevin
    

    On Tue, Nov 18, 2008 at 8:24 AM, Andrus Adamchik <andru..bjectstyle.org> wrote: > Yeah, the whole git-on-top-of-svn thing seems to lead to people holding off > commits till things are fully ready to go. This is not the way I like to > work (even though I really enjoy git capabilities). Not sure how people work > on SVN-less git projects? Do they publish an up-to-date clone of their local > repo on git-hub or something? > > I am personally trying to commit as often as possible without breaking the > trunk, but still, there has to be a better way... > > Andrus > > > On Nov 18, 2008, at 3:00 PM, Aristedes Maniatis wrote: >> >> On 18/11/2008, at 9:34 PM, Andrus Adamchik wrote: >> >>> I don't care that much about the..gnore annotation, as I am using git, >>> so I keep all my failing tests in the local repo, but I certainly have no >>> objections to the upgrade idea in general. >> >> That's great you've kept them in git, I was wondering where they went. But >> if we use the..gnore then they would be more visible to others who might be >> inspired to fix them or be aware of the failing test. >> >> No big deal, just a thought. >> >> Ari >> >> >> >> --------------------------> >> ish >> http://www.ish.com.au >> Level 1, 30 Wilson Street Newtown 2042 Australia >> phone +61 2 9550 5001 fax +61 2 9550 4001 >> GPG fingerprint CBFB 84B4 738D 4E87 5E5C 5EFA EF6A 7D2E 3E49 102A >> >> >> > >



    This archive was generated by hypermail 2.0.0 : Tue Nov 18 2008 - 08:33:25 EST