[Buildbot-devel] darcs and changelogs (re: Buildbot with virtual machines)

[Kevin Turner]

On Sat, 2006-08-19 at 12:32 -0700, Brian Warner wrote:

>   One issue I'm still trying to figure out is how to merge the (rather
>   serialized) ChangeLog entries. I think what I want to do is to use the
>   top-level ChangeLog file for the official repository (i.e., entries are
>   only added to it when the change is committed to the canonical repo), but
>   make a repo.ChangeLog file in which incremental notes are added. When I
>   merge a repo into the official one, I'll move the repo.ChangeLog entries
>   into the real ChangeLog and delete repo.ChangeLog .

Hopefully each repo.ChangeLog gets a unique name?  (e.g.
%(repo)s.ChangeLog).  Otherwise this sounds likely to generate conflicts
with every merge.