From: Songmao Tian <kingkongmao@gmail.com>
Date: Sun, 07 Jan 2007 08:12:13 GMT
Subject: Re: Hello all, I am using git-svn and have some question
Message-ID: <7d73e7d80701070012y5f15cde4gf2d9a36fab1815ae@mail.gmail.com>
In-Reply-To: <20070107063101.GA23429@mayonaise.dyndns.org>

exactly~, thx again

On 1/7/07, Eric Wong <normalperson@yhbt.net> wrote:
> Songmao Tian <kingkongmao@gmail.com> wrote:
> > I have made a mistake, while use 1.4.4.1, exec git-svn multi-fetch
> > will find possible parent for each branch, but 1.4.4.3 will not.
> >
> > with parent found, git-rebase between branches will result in less
> > conflict. I wonder if I have made another mistake while using
> > 1.4.4.3:), for i like the way 1.4.4.1's multi-fetch did
>
> I don't see anything regarding multi-fetch changed between
> v1.4.4.1..v1.4.4.3.  Did you forget the --follow-parent flag?
> No worries though, you can use 'git-svn graft-branches' to
> connect a branch to its parent; and if that doesn't work automatically;
> you can edit the .git/info/grafts file with parent info (it's
> documented in Documentation/repository-layout.txt.
>
> --
> Eric Wong
>