Re: git-svn: how to connect SVN branches?

From: dherring@ll.mit.edu <dherring@ll.mit.edu>
Date: Jan 18, 2008, 14:43 UTC
Message-ID: <alpine.LNX.0.999999.0801180932310.3479@mojave>
In-Reply-To: <478FD0E5.2080006@vilain.net>

Sam, Gregory, thanks for solving my problem.

On Thu, 17 Jan 2008, Sam Vilain wrote:

Show 22 quoted lines

> dherring@ll.mit.edu wrote:
>> `git-svn fetch` pulled the new branch.  However, it created a whole new
>> history for this branch (new git commits from the beginning of the SVN
>> repo).
>>
>> Is there some way to tell git/git-svn to connect these two histories?
>
> git-svn doesn't yet support arbitrary mapping of paths like that.  You
> need to add a separate git-svn remote, and you might have to graft to
> get it started - see below.
>
>> Pictorially, I have
>>
>> SVN1@a---SVN2@a---SVN3@b---SVN4@b---SVNtrunk
>> SVN1@b---SVN2@b---SVN3@b---SVN4@b---SVNbranch
>
> That's unfortunate.  There are many things that git-svn does to try to
> avoid this happening.  You can fix it using the .git/info/grafts
> facility - check the Documentation/ for information on that.  Once
> you've got it looking right, git filter-branch can be used to make it
> permanent, though you should certainly delete the git-svn metadata after
> using that.

Documentation/repository-layout.txt had the best info on grafts. A few graft lines and my git repo looks just right. For now, I'm scared of breaking git-svn again; filter-branch can wait for later.

Thanks again, Daniel