Re: git-svn and huge data and modifying the git-svn-HEAD branch directly

From: Eric Wong <normalperson@yhbt.net>
Date: Feb 27, 2006, 20:27 UTC
Message-ID: <20060227202713.GB21684@hand.yhbt.net>
In-Reply-To: <62354.84.163.87.135.1141068867.squirrel@mail.geht-ab-wie-schnitzel.de>

Nicolas Vilz 'niv' <niv@iaglans.de> wrote:

> ok, i experienced that on little modifications on the git-svn-HEAD branch
> either... so its really about modifying and not about the huge data
> ammount...

 
Huge data should not have anything to do with it.  Well, besides
increasing the chance of somebody committing a conflicting commit while
you're in the middle of your commit.  But hey, that's the nature of
centralized SCMs.

Show 24 quoted lines

> >> now i am still on rev 2 on this branch but i updated it to rev 5 on the
> >> svn-side...
> >>
> >> any hints?
> >
> > Save your current work in git-svn-HEAD to a private branch
> >
> > 	git branch -b private git-svn-HEAD
> >
> > then reset git-svn-HEAD to the last revision where it was managed by
> > git-svn fetch:
> >
> > 	git-checkout git-svn-HEAD
> > 	git-log (look for the last commit with 'git-svn-id:' in it)
> > 	git-reset --hard <last commit with 'git-svn-id:' in it>
> >
> > Now go to your private branch:
> >
> > 	git checkout private
> >
> > And continue working on your private branch as usual.
> 
> I will keep that in mind for the future. Fortunatelly i am still testing
> and i saved the git repository before experimenting with git-svn.

:)

Show 8 quoted lines

> Have you any suggestions howto migrate a git-repository to svn and then
> work with git-svn on both of it? I tried cg-merge -j to merge my git
> branch with the private git svn branch, i am allowed to modify safely.
> 
> that does work actually... now i can start getting this automated.
> 
> perhaps i will write a patch with that automated script, when it is
> finished, just to contribute git.

Cool. I don't know much about cg-*, but I think I did more or less the same thing (joining branches, but did the join on git-svn-HEAD instead of a git-only branch) using <revision>=<commit> arguments[1] to git-svn fetch.

[1] - See the 'Additional Fetch Arguments' section of the manpage for more info on this. I'll freely admit that the UI for this was an accident, but it works fairly well for me.

-- 
Eric Wong