[Buildbot-devel] darcs and changelogs
kevin at janrain.com
Thu Aug 24 18:28:01 UTC 2006
On Wed, 2006-08-23 at 14:24 -0700, Brian Warner wrote:
> Well, the idea would be that when the feature-repository gets merged to
> trunk, you delete repo.ChangeLog in the same patch that incorporates its
> contents into the master ChangeLog.
But darcs applies patches according to their dependencies, not according
no when you're merging them, right?
So if I pull buildbot-0.7.4 and make branch-sendtry, and you make
branch-newgui, we both record a patch that adds to repo.ChangeLog. You
merge newgui first, but darcs knows that the patch I added to sendtry's
repo.Changelog comes *before* your "removed repo.ChangeLog for newgui,
merged to trunk" patch, so it tries to merge it in there.
More information about the devel