emacs-devel
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: rebasing


From: Stephen J. Turnbull
Subject: Re: rebasing
Date: Fri, 29 Jan 2010 00:06:50 +0900

Miles Bader writes:

 > Often the sort of commit I'm talking about is relatively short-lived and
 > ephemeral, but I usually do not want to commit to the central repo on
 > the spot, I'd rather commit stuff locally and let it live in my local
 > system for a while; I may or may not want to send it upstream or delete
 > it or whatever.

You may want looms or pipelines, then.

 > A rebase-on-pull-style workflow, gives some of the immediacy of a pure
 > CVS-style workflow, but still allows local commits / disconnection
 > operation / etc.  I.e.: good.

The only way to do that in Bazaar as far as I know is to maintain a
separate branch for your local changes.  If you have multiple sets of
such changes, you'll need multiple branches, one for each set.  And
you would do it not by pulling, but by merging from trunk into your
branch.  You'd probably need to cherrypick patches out of that, not
rebase on to trunk (ie, sending stuff upstream will not get full
support from the VCS).





reply via email to

[Prev in Thread] Current Thread [Next in Thread]