Re: Workflow to accumulate individual changes?

[Juanma Barranquero]

On Thu, Dec 31, 2009 at 05:21, Eli Zaretskii <address@hidden> wrote:

> Except that most experts on bzr I've read say rebasing is the wrong
> way to go[1].

Personally, and with all due respect, I don't consider this: "There
are many theoretical objections to rebasing, and I won’t rehash them
here. There’s general consensus that rebasing is sort of icky." as a
sort of expert opinion, just biased. People used to git's rebase find
it extremely useful. And, in fact, this other bit:

> “Why isn’t rebase support in core?” Rebase support is currently packaged
> as a plugin. This plugin is widely distributed, even in the standard Mac OS
> X installation bundle.

isn't exactly true anymore, as it is also included at least in the
standard Windows standalone installation.

> So I think we should not flee to that corner so easily,
> upon bumping on the first problematic issue.

We're not fleeing into any corner. Weren't I thinking that ChangeLog
present problems that should be discussed, I wouldn't have brought the
issue.

> ChangeLog files will present a problem for feature branches and
> quick-fix branches alike.  Though an annoyance, I don't see how it is
> a problem significant enough to recommend rebase as the main vehicle
> of routine work, given the downside of rebasing (rewriting history
> etc.).
>
> Am I missing something?

Yes. Neither of us is "recommending rebase as the main vehicle of
routine work". I was talking very specifically of a workflow I intend
to use, but I have no idea how common it'll be for other people; and
for my use, an interactive rebase would be a perfect option. I
wouldn't dream of suggest Karl to discuss rebase on BzrForEmacsDevs,
for example.

    Juanma