Newsgroups: php.internals
Path: news.php.net
Xref: news.php.net php.internals:47285
Mailing-List: contact internals-help@lists.php.net; run by ezmlm
Received-SPF: pass (pb1.pair.com: domain gmail.com designates 209.85.218.216 as permitted sender)
DomainKey-Status: bad
DomainKey-Signature: a=rsa-sha1; c=nofws;
        d=gmail.com; s=gamma;
        h=mime-version:in-reply-to:references:date:message-id:subject:from:to
         :content-type:content-transfer-encoding;
        b=qe19qm+5Waa9BBkZQPHkPbOfHY2dK45GRXBU8loavgimTCLjL0HyfGNUc2qmhwE21u
         Afxn2vYEaKbCGTyLjM+93FF/fkidravyndkuondslWBy2izLdiD7lzoLpml0K+47lb3w
         +Ej8CnfJ7VRXbaPXQxHzpyaiO/NUqrWUwZMYw=
MIME-Version: 1.0
In-Reply-To: <cd1fb7541003141925s35d50dabu2f79109a6322ba61@mail.gmail.com>
References: <36D0BC9D-72BA-4087-9088-A054F0E82A52@pooteeweet.org>
	 <slrnhpq56m.oq2.sn_@experimentalworks.net>
	 <BABAA7D9-A038-455D-B569-39C5637EB30F@darkrainfall.org>
	 <b54d0abe1003141242p5cd1b66fs619895da153dec47@mail.gmail.com>
	 <AAE1575B-0F46-40FC-9BFB-7BA7577433AA@pooteeweet.org>
	 <f658eb6f1003141425o717012efib0779293bc250fcd@mail.gmail.com>
	 <cd1fb7541003141925s35d50dabu2f79109a6322ba61@mail.gmail.com>
Date: Sun, 14 Mar 2010 22:56:07 -0700
Message-ID: <f658eb6f1003142256w7f1aa7e8ma3f839d845d930c5@mail.gmail.com>
To: Moriyoshi Koizumi <mozo@mozo.jp>, internals@lists.php.net
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: quoted-printable
Subject: Re: [PHP-DEV] Re: moving forward
From: hermanradtke@gmail.com (Herman Radtke)

> There are a number of ways to share your branches with others. =C2=A0At
> least you can do it by pushing your local changesets to some remote
> repository. =C2=A0I've actually been experimenting with modified PHP core
> with some language features added by forking the mirror on github.com
> [1]. =C2=A0I've never felt any inconvenience there. =C2=A0I really apprec=
iate
> 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?

--=20
Herman Radtke
hermanradtke@gmail.com | http://hermanradtke.com