Re: Conflicting ChangeLogs (was: Re: Documentation: Editing the ChangeLog file with emacs

[Åsmund Skjæveland <asmund skjaveland usit uio no>]

On Sat, Jun 03, 2006 at 04:16:24PM +0930, Clytie Siddall wrote:
> Speaking of ChangeLogs, I've come across quite a few recently which  
> have needed reconciling: I update the ChangeLog, and CVS tells me  
> it's tried to merge the differences, but is giving up with a  
> headache, so it passes the headache on to me. ;)
> 
> I don't mind doing this occasionally, but I've had to do it too many  
> times recently. It can take a while, with large differences.
> 
> I think it's nearly always (or always) been Gnome-2-14 modules'  
> ChangeLogs.
> 
> Is there any reason why so many ChangeLogs would have major  
> conflicts? If so, is there anything we can do to avoid it?

do a "cvs update ChangeLog" before you add your entry. Don't add your
entry until just before you commit your updated PO file. It's a lot
less likely that somebody else will update the ChangeLog in the minute
it takes you to update the ChangeLog, add your entry, and commit the
new ChangeLog and PO files.


-- 
Åsmund Skjæveland {
	kaffi();
}