Re: Howto use StGit and git-svn at same time
- From
Yann Dirson <ydirson@altern.org>
- Date
- Jan 9, 2007, 22:41 UTC
- Message-ID
- <20070109224125.GF17093@nan92-1-81-57-214-146.fbx.proxad.net>
- In-Reply-To
- <8b65902a0701091341v5983c113tc5cd32c6c4c57719@mail.gmail.com>
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.