[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: Workflow to accumulate individual changes?
From: |
Óscar Fuentes |
Subject: |
Re: Workflow to accumulate individual changes? |
Date: |
Thu, 31 Dec 2009 02:04:40 +0100 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.1.90 (gnu/linux) |
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
- Workflow to accumulate individual changes?, Juanma Barranquero, 2009/12/30
- Re: Workflow to accumulate individual changes?, Juanma Barranquero, 2009/12/30
- Re: Workflow to accumulate individual changes?, Óscar Fuentes, 2009/12/30
- Re: Workflow to accumulate individual changes?, Eli Zaretskii, 2009/12/30
- Re: Workflow to accumulate individual changes?, Juanma Barranquero, 2009/12/30
- Re: Workflow to accumulate individual changes?, Miles Bader, 2009/12/31
- Re: Workflow to accumulate individual changes?, Eli Zaretskii, 2009/12/31
- Re: Workflow to accumulate individual changes?, Eli Zaretskii, 2009/12/31
- Re: Workflow to accumulate individual changes?, Juanma Barranquero, 2009/12/31
- Re: Workflow to accumulate individual changes?, Karl Fogel, 2009/12/31