git-svn: how to connect SVN branches?
- From
- dherring@ll.mit.edu <dherring@ll.mit.edu>
- Date
- Jan 17, 2008, 20:17 UTC
- Message-ID
- <alpine.LNX.0.999999.0801171237110.3479@mojave>
Hi,
The project I'm tracking changed servers a couple months ago. To simulate the svn-switch, I edited the svn-remote.url to the new location. `git-svn fetch`, `git-svn dcommit`, and the like seemed to work ok.
When a new release branch came out, I tried adding svn-remote.branches = releases/*:refs/remotes/svn/*
`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?
Pictorially, I have
SVN1@a---SVN2@a---SVN3@b---SVN4@b---SVNtrunk SVN1@b---SVN2@b---SVN3@b---SVN4@b---SVNbranch
and want
SVN1@a---SVN2@a---SVN3@b---SVN4@b---SVNtrunk
\--SVNbranchSimilarly, if someone cloned a git repo full of git-svn-id's (which indicate that an svn --switch occurred) but without any matching git-svn data, is there a way to `git-svn fetch` from the new SVN repo and autoconnect the git commits?
Thanks, Daniel