[Pm-utils] Fwd: [PATCH 1/1] Generate ChangeLog on demand.

[Michael Biebl]

2008/3/9, Victor Lowther <victor.lowther at gmail.com>:
> On Sun, Mar 09, 2008 at 03:37:23PM +0100, Michael Biebl wrote:
>  > Agreed, the merge conflicts are definitely a problem.
>
>
> The original patch series explicitly discarded merge-related ChangeLog
>  entries -- I removed that option when dbn expressed concerns on how
>  available that switch is.  Adding it back would not be a problem,
>  assuming that we can make it a requirement that the person generating
>  the official dist tarball have a git version recent enough to have the
>  --no-merges switch.
>

I think this is a misunderstanding.
The merge conflicts I was referring to (and I think sjoerd, too), are
when you have a hand-written Changelog.
E.g. if you have different topic branches and you write Changelogs for
each topic branch, you will most certainly get merge conflicts on the
final merge.
So, this problem is actually  a point for using generated changelogs.

Cheers,
Michael


-- 
Why is it that all of the instruments seeking intelligent life in the
universe are pointed away from Earth?