From: Karl Hasselström <kha@treskal.com>
Date: Wed, 17 Jan 2007 09:03:13 GMT
Subject: Re: Rebasing stgit stacks
Message-ID: <20070117090313.GA9283@diana.vm.bytemark.co.uk>
In-Reply-To: <eojn5c$v9u$1@sea.gmane.org>

On 2007-01-17 00:30:18 +0100, Jakub Narebski wrote:

> Yann Dirson wrote:
>
> > My example is quite similar to the one given by Guilhem: I had a
> > git branch coming from git-cvsimport, and my stgit stack forked
> > atop that branch.  At some point git-cvsimport fucked something,
> > and I regenerated a new mirror branch using it in a fresh repo.
> > Then I wanted to rebase my stack on that new branch.
>
> I'm all for calling this command "stg rebase". Currently you can do
> "stg push -a; stg commit -a; git rebase; stg uncommit -n <n>"...

Or simpler,

  stg pop -a
  git reset --hard <new_base>
  stg push -n <n>

This uses stgit for all operations that can conflict.

(BTW, I've never seriously tried git rebase; does anyone have an
opinion of how convenient its conflict handling is, compared to
stgit's?)

-- 
Karl Hasselström, kha@treskal.com
      www.treskal.com/kalle