Re: help needed: Splitting a git repository after subversion migration

From: Björn Steinbrink <b.steinbrink@gmx.de>
Date: Dec 11, 2008, 08:10 UTC
Message-ID: <20081211081009.GA14639@atjola.homenet>
In-Reply-To: <200812101733.36221.thomas.jarosch@intra2net.com>

On 2008.12.10 17:33:28 +0100, Thomas Jarosch wrote:

Show 14 quoted lines

> On Monday, 8. December 2008 18:34:20 Thomas Jarosch wrote:
> > 1. When I run "git rev-list --all --objects", I can see file names that
> > look like "SVN-branchname/directory/filename". Is it normal that "git svn"
> > creates a directory with the name of the branch and puts files below it?
> 
> Ok, this seems to be a PEBKAC: In the history of the subversion repository, 
> f.e. I once copied the "branches" root folder to tags/xyz. One revision later 
> I noticed this and retagged the correct branch. git-svn imports all branches
> from the first tag, which is the correct thing to do :o)
> 
> Now I'll manually check the history of the tags/ and branches/ folder
> for more funny tags and write down the revision. If I understood
> the git-svn man page correctly, I should be able to specifiy
> revision ranges it's going to import. I'll try to skip the broken tags.

As long as the breakage only involves branches/tags that are completely useless, it's probably a lot easier to just delete them afterwards.

And if you accidently added changes to a tag, after it was created, it's also easier to manually tag to right version in git, and just forgetting about the additional commit.

And for a bunch of other cases, rebase -i/filter-branch are probably also better options ;-)

Skipping revisions in a git-svn import sounds rather annoying and error-prone.

Björn