From: "Óscar Fuentes" <ofv@wanadoo.es>
To: emacs-devel@gnu.org
Subject: Re: rebasing
Date: Thu, 28 Jan 2010 15:42:10 +0100 [thread overview]
Message-ID: <87r5pathod.fsf@telefonica.net> (raw)
In-Reply-To: 877hr29vru.fsf@catnip.gol.com
Miles Bader <miles@gnu.org> writes:
> Óscar Fuentes <ofv@wanadoo.es> writes:
>>> I ask because for the common small random commits case, it seems _much_
>>> better to just commit to the trunk locally and rebase these local
>>> commits on pulling from the main repository; the "keep N branches and
>>> merge back and forth, even for trivial commits" recipe that is
>>> apparently advocated for emacs seems like a huge annoyance.
>>
>> I'm having trouble figuring out which kind of workflow would benefit
>> from this. Unless you work disconnected, or for some other reason wish
>> to send upstream your quick fixes on batches, how would you benefit from
>> `rebase'? If you work connected, just do your quick fixes on a branch
>> bound to upstream, then you essentially do the same sequence of
>> operations you used with CVS: update & commit, and everything with
>> VC-dir.
>
> I don't understand what you're saying -- you mean I should give up local
> commits, and just use CVS-style "commits go directly to the central
> repo"?
No.
> 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.
>
> 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.
Agreed. However, you will find that bzr's support for this is quite weak
compared to git. First, as previously said, bzr's `rebase' is very
simple, do `bzr help rebase' and check it yourself. Second, bzr does not
track merges of specific revisions. This causes that sending upstream a
selected set of revisions or discarding some others from your local
branch are delicate and lengthy operations.
next prev parent reply other threads:[~2010-01-28 14:42 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 ` Óscar Fuentes [this message]
2010-01-28 15:06 ` rebasing Stephen J. Turnbull
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
List information: https://www.gnu.org/software/emacs/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=87r5pathod.fsf@telefonica.net \
--to=ofv@wanadoo.es \
--cc=emacs-devel@gnu.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://git.savannah.gnu.org/cgit/emacs.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).