From: Eric Wong Date: Tue, 17 Nov 2009 07:42:08 GMT Subject: Re: [PATCH] Document git-svn's first-parent rule Message-ID: <20091117074208.GA337@dcvr.yhbt.net> In-Reply-To: <7vd43his6n.fsf@alter.siamese.dyndns.org> Junio C Hamano wrote: > Eric Wong writes: > > > Thomas Rast wrote: > >> git-svn has the following rule to detect the SVN base for its > >> operations: find the first git-svn-id line reachable through > >> first-parent ancestry. IOW, > >> > >> git log --grep=^git-svn-id: --first-parent -1 > >> > >> Document this, as it is very important when using merges with git-svn. > >> > >> Signed-off-by: Thomas Rast > > > > Thanks Thomas, > > > > Acked-by: Eric Wong > > Thanks; is it a good time to pull from your bogomips repository to get > accumulated changes? Now is, I just pushed to it: Eric Wong (3): git svn: read global+system config for clone+init git svn: add authorsfile test case for ~/.gitconfig git svn: attempt to create empty dirs on clone+rebase Thomas Rast (1): Document git-svn's first-parent rule Toby Allsopp (1): git svn: handle SVN merges from revisions past the tip of the branch HEAD=ce45a45f24cc7b3ccc7f6ebcd0025559b4421bda -- Eric Wong