From: "Guilhem Bonnefille" <guilhem.bonnefille@gmail.com>
To: "Yann Dirson" <ydirson@altern.org>
Cc: git@vger.kernel.org
Subject: Re: Howto use StGit and git-svn at same time
Date: Mon, 15 Jan 2007 14:26:36 +0100 [thread overview]
Message-ID: <8b65902a0701150526j5a954529xf45b2d0348a77573@mail.gmail.com> (raw)
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/
next prev parent reply other threads:[~2007-01-15 17:20 UTC|newest]
Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top
2007-01-09 21:35 Howto use StGit and git-svn at same time Guilhem Bonnefille
2007-01-09 21:41 ` Guilhem Bonnefille
2007-01-09 22:41 ` Yann Dirson
2007-01-15 13:26 ` Guilhem Bonnefille [this message]
2007-01-15 20:24 ` Rebasing stgit stacks Yann Dirson
2007-01-15 22:46 ` Catalin Marinas
2007-01-15 23:39 ` Yann Dirson
2007-01-16 22:42 ` Catalin Marinas
2007-01-16 23:17 ` Yann Dirson
2007-01-16 23:30 ` Jakub Narebski
2007-01-17 9:03 ` Karl Hasselström
2007-01-17 11:07 ` David Kågedal
2007-01-17 19:34 ` Yann Dirson
2007-01-17 20:53 ` Yann Dirson
2007-01-18 12:06 ` Catalin Marinas
2007-01-18 19:42 ` Yann Dirson
2007-01-19 9:40 ` Jakub Narebski
2007-01-20 13:17 ` Yann Dirson
2007-01-20 19:16 ` Jakub Narebski
2007-01-20 20:07 ` Yann Dirson
2007-01-22 23:12 ` Catalin Marinas
2007-01-18 9:05 ` Catalin Marinas
2007-01-18 20:52 ` Yann Dirson
2007-01-19 9:47 ` Jakub Narebski
2007-01-22 17:54 ` Catalin Marinas
2007-01-22 19:47 ` Yann Dirson
2007-01-22 22:58 ` Catalin Marinas
2007-01-23 7:49 ` Yann Dirson
2007-01-23 22:03 ` Catalin Marinas
2007-01-24 0:05 ` Yann Dirson
2007-01-24 12:37 ` Catalin Marinas
2007-01-24 20:03 ` Yann Dirson
2007-01-28 4:33 ` Theodore Tso
2007-01-28 10:25 ` Yann Dirson
2007-01-28 23:21 ` Catalin Marinas
2007-01-17 21:30 ` Yann Dirson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=8b65902a0701150526j5a954529xf45b2d0348a77573@mail.gmail.com \
--to=guilhem.bonnefille@gmail.com \
--cc=git@vger.kernel.org \
--cc=ydirson@altern.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).