Re: Rebasing stgit stacks

From: Yann Dirson <ydirson@altern.org>
Date: Jan 28, 2007, 10:25 UTC
Message-ID: <20070128102552.GF4036@nan92-1-81-57-214-146.fbx.proxad.net>
In-Reply-To: <20070128043312.GG9897@thunk.org>

On Sat, Jan 27, 2007 at 11:33:12PM -0500, Theodore Tso wrote:

Show 16 quoted lines

> On Mon, Jan 22, 2007 at 10:58:41PM +0000, Catalin Marinas wrote:
> > StGIT stacks are a series of volatile commits (commits) at the top of
> > a branch. The idea when I started writing this tool was that a series
> > of applied patches would lead to the head of the current branch. The
> > branch and stack are tightly coupled and you cannot simply change the
> > parent branch the stack is based on (not from a technical point but
> > rather from conception one).
> 
> Well, a typical use case for me is:
> 
> 	stg branch master
> 	git pull .
> 	stg branch 2.6.20-rc5
> 	stg export -d /tmp/temp-stack
> 	stg branch master
> 	stg branch -C 2.6.20-rc6

You mean lowercase "-c", right ?

Show 5 quoted lines

> 	stg import -s /tmp/temp-stack/series 
> 
> That's because I want to keep the original patch series for
> 2.6.20-rc5, but I also want rebase the patch set to 2.6.20-rc6.  Is
> there a better way of doing this?

Yes.  First, you can clone your stack:

stgit$ stg branch --clone copy Cloning current branch to "copy"... done stgit$ stg branch -l Available branches:

> s     copy    | clone of "master"

  s     master  | 
        origin  |

And then you can rebase the clone, either with "stg rebase" (in stg HEAD only), or use the small tip described at http://git.or.cz/gitwiki/GitTips#head-8e71c3bdda0c372b79e33f5a3fedaf22c4c6f944

Best regards,

-- 
Yann.