From: Guilhem Bonnefille <guilhem.bonnefille@gmail.com>
Date: Mon, 15 Jan 2007 13:26:36 GMT
Subject: Re: Howto use StGit and git-svn at same time
Message-ID: <8b65902a0701150526j5a954529xf45b2d0348a77573@mail.gmail.com>
In-Reply-To: <20070109224125.GF17093@nan92-1-81-57-214-146.fbx.proxad.net>

Ok, thanks for the reminder: I forgot "stg pop/push".

I redo whole job as this:
- git-svn -i trunk fetch
- stg pop -a
- git-rebase remotes/trunk # as recommended by git-svn manual
- stg push -a
- playing another merging game as my patches submissions were modified
since archived

Thanks.

On 1/9/07, Yann Dirson <ydirson@altern.org> wrote:
> On Tue, Jan 09, 2007 at 10:41:20PM +0100, Guilhem Bonnefille wrote:
> > Humh...
> > I finished the conflicts solving game. I think the way I choosed is
> > incorrect. Following gitk, it is now a big big bazaar in my commits
> > history.
>
> Right, you should not use git-rebase on a StGIT branch :)
>
> What you should have done is moving your stack base from your old
> origin branch to remotes/trunk - something that StGIT does not support
> yet from command-line, but I've done this manually in the past
> (migrating an StGIT stack after re-running a full git-cvsimport after
> the original cvs branch got corrupted).
>
> Something along the line of (untested, off the top of my head):
>
> $ stg pop -a
> $ echo <TARGET-SHA1>  >  .git/refs/heads/<BRANCH>
> $ echo <TARGET-SHA1>  >  .git/refs/bases/<BRANCH>
>
> And then use "stg push" and "stg resolved -i" to resolve the conflicts.
>
> But always be sure of backing up your .git before doing such by-hand
> experiments.
>
> Best regards,
> --
> Yann.
> -
> To unsubscribe from this list: send the line "unsubscribe git" in
> the body of a message to majordomo@vger.kernel.org
> More majordomo info at  http://vger.kernel.org/majordomo-info.html
>


-- 
Guilhem BONNEFILLE
-=- #UIN: 15146515 JID: guyou@im.apinc.org MSN: guilhem_bonnefille@hotmail.com
-=- mailto:guilhem.bonnefille@gmail.com
-=- http://nathguil.free.fr/