On Tue, Oct 03, 2006 at 01:13:18PM -0400, Greg Troxel wrote:
> 'make changes-entry' currently appends a line to
> pkgsrc/doc/CHANGES-2006.   I have two problems with this:

[snip]

If you want to modify the current logic, I think it would be a better
idea to adjust the logic to add entries to something like
CHANGES-2006.$user and commit target to run cvs up first, append that
file, commit it and remove it again. This would reduce the number of 
conflicts extremely. The old behaviour could be kept as integrated
target doing both.

Joerg