git-svn question

git-svn question

[Joseph Carrafa]

I have a question concerning using git with an svn repo.  I have a
local git repo that was created with git svn init
$SVNROOT/branches/2.2.0.  we moved the svn branch to
$SVNROOT/branches/2.3.0.  how can i change my local git repo to commit
to the new svn branch, $SVNROOT/branches/2.3.0?

Thanks
-Joe

Re: git-svn question

[Seth Falcon]

"Joseph Carrafa" <carrafaj@gmail.com> writes:

> I have a question concerning using git with an svn repo.  I have a
> local git repo that was created with git svn init
> $SVNROOT/branches/2.2.0.  we moved the svn branch to
> $SVNROOT/branches/2.3.0.  how can i change my local git repo to commit
> to the new svn branch, $SVNROOT/branches/2.3.0?

See this thread:
http://article.gmane.org/gmane.comp.version-control.git/33715/match=seth+falcon

And read the Advanced Example: Tracking a Reorganized Repository in
the git-svn man page.

+ seth

git-svn question

[carbonated beverage]

Hi all,

I'm trying to figure out how to import a rather large SVN tree that has been
around for a while, initially converted from CVS.

The layout is a bit odd.  Instead of standard branch/tags/trunk, it has those
directories multiply nested, e.g.:

A/
A/branches
A/branches/B
A/branches/B/branches
A/branches/B/tags
A/branches/B/trunk
A/tags/tag-1/branches
A/tags/tag-1/tags/B/branches
A/tags/tag-1/tags/B/tags
A/tags/tag-1/tags/B/trunk
A/tags/tag-1/trunk
A/trunk

etc.

Given multiple projects that are nested as such, is there a way to get git-svn
to import the tree and be able to derive the tags and branches?  Also, this
tree is a little over 1TiB in size, though a large chunk of that is due to
the duplicates made by SVN's branches/tags.

Thanks,

-- DN
Daniel N.

Re: git-svn question

[Wesley J. Landaker]

On Thursday, July 15, 2010 11:18:49 carbonated beverage wrote:
> I'm trying to figure out how to import a rather large SVN tree that has
> been around for a while, initially converted from CVS.
[...]
> Given multiple projects that are nested as such, is there a way to get
> git-svn to import the tree and be able to derive the tags and branches? 
> Also, this tree is a little over 1TiB in size, though a large chunk of
> that is due to the duplicates made by SVN's branches/tags.

That sounds pretty messed up. Someone may have better advice, but I'd 
probably approach it by doing one or more of the following:

  1) Fix it up with svndumpfilter first to get rid of useless or duplicated 
parts, then import it.

  2) Once imported into use git rebase and/or git filter-branch to clean 
things up until it's how you like it.

  3) If all else fails, archive the SVN repository (or the git imported 
equivalent), call it "old history", and then start over and manually import 
only the active and useful branches and tags into git.