Re: bzr send workflow

[Andy Wingo]

Greets,

On Sat 21 Aug 2010 18:05, Stefan Monnier <address@hidden> writes:

> Before we can switch to such a system, we need to get rid of the
> ChangeLog files (which are otherwise a constant source of spurious
> conflicts which make such a workflow impractical).  I haven't dared to
> enter this discussion yet.

That I am aware of, you have two good options:

 * Keep writing changelogs, pasting them into the commit logs as you do
   already, and add special support to merging changelogs (e.g.:
   git-merge-changelog from gnulib, perhaps ported to bzr if you stay
   with bzr)

 * Stop writing changelogs, and generate changelogs via a
   dist-hook. Guile does this now, using gitlog-to-changelog from
   gnulib.

Cheers,

Andy
-- 
http://wingolog.org/