Re: Re: moving forward

From: Date: Mon, 15 Mar 2010 05:56:07 +0000
Subject: Re: Re: moving forward
References: 1 2 3 4 5 6 7  Groups: php.internals 
Request: Send a blank email to internals+get-47285@lists.php.net to get a copy of this message
> There are a number of ways to share your branches with others.  At > least you can do it by pushing your local changesets to some remote > repository.  I've actually been experimenting with modified PHP core > with some language features added by forking the mirror on github.com > [1].  I've never felt any inconvenience there.  I really appreciate > those who set up the mirror. Yes, this is possible, but in my experience branch sharing quickly falls apart in practice. If I make some change to foo.c, push it to your branch and then later on do a rebase to update from svn I just rewrote history. The commit hash you have for foo.c is now different than mine. Now sure you can also rebase, but what if you are away? I am stuck until you return. Or what if you have a commit to foo.c that is made after my commit, but updating from svn creates a conflict you need to resolve? You then again rewrite history and now I have to sync back up. And good luck if one of us cherry-picks. I think git svn does a great job for individuals working solo on a project, but for me it starts to become too tedious when groups of people are passing around branches. Or maybe I am just doing it all wrong? -- Herman Radtke hermanradtke@gmail.com | http://hermanradtke.com

« previous php.internals (#47285) next »