all messages for Emacs-related lists mirrored at yhetil.org
 help / color / mirror / code / Atom feed
From: "Stephen J. Turnbull" <stephen@xemacs.org>
To: Miles Bader <miles@gnu.org>
Cc: "Óscar Fuentes" <ofv@wanadoo.es>, emacs-devel@gnu.org
Subject: Re: rebasing
Date: Fri, 29 Jan 2010 00:06:50 +0900	[thread overview]
Message-ID: <87y6jis1yt.fsf@xemacs.org> (raw)
In-Reply-To: <877hr29vru.fsf@catnip.gol.com>

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).





  parent reply	other threads:[~2010-01-28 15:06 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2010-01-28  1:53 rebasing Miles Bader
2010-01-28  2:54 ` rebasing Stefan Monnier
2010-01-28  5:08 ` rebasing Karl Fogel
2010-01-28 13:59   ` rebasing Miles Bader
2010-01-28 14:28     ` rebasing David Engster
2010-01-28 14:53     ` rebasing Stephen J. Turnbull
2010-01-28 11:33 ` rebasing Óscar Fuentes
2010-01-28 13:57   ` rebasing Miles Bader
2010-01-28 14:42     ` rebasing Óscar Fuentes
2010-01-28 15:06     ` Stephen J. Turnbull [this message]
2010-01-28 18:41     ` rebasing Eli Zaretskii
     [not found] <20181214083441.4064.68736@vcs0.savannah.gnu.org>
     [not found] ` <20181214083451.EC1C820538@vcs0.savannah.gnu.org>
2018-12-14 12:03   ` Rebasing (was: [Emacs-diffs] feature/gnus-select 46738e3 040/218: Improve SVG documentation) Stefan Monnier
2018-12-17  1:32     ` Rebasing Andrew Cohen
2018-12-17  3:43       ` Rebasing Eric Abrahamsen

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

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=87y6jis1yt.fsf@xemacs.org \
    --to=stephen@xemacs.org \
    --cc=emacs-devel@gnu.org \
    --cc=miles@gnu.org \
    --cc=ofv@wanadoo.es \
    /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 external index

	https://git.savannah.gnu.org/cgit/emacs.git
	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.