Re: Workflow to accumulate individual changes?

[Óscar Fuentes]

Juanma Barranquero <address@hidden> writes:

> Anyway, after thinking about the issue, I'm not sure it'd work,
> because of ChangeLog.

[snip]

>   # dates in ChangeLog are wrong, so you need an additional commit to
> fix the ChangeLog entries
>
> so it only really works for fixes that do not need ChangeLog entries.

Thinking a bit more about this...

`rebase' stops if it finds conflicts, then you need to resolve the
conflicts (i.e. edit the conflicted changes) and continue the rebase.

If somehow the rebase finds a conflict on the ChangeLog for every
rebased revision, you could fix the dates. I know by experience that
Subversion generates a conflict every time two changes append lines to a
file. If bzr generates a conflict when two changes happen at the top of
the ChangeLog file, you could arrange things for this to happen: the
first revision should conflict right away; for the second revision to
conflict, you'll need to leave the top of the ChangeLog on a way that it
can't merge the second revision, etc.

-- 
Óscar