[Webkit-unassigned] [Bug 15600] prepare-ChangeLog and update-webkit create needless ChangeLog conflicts

[bugzilla-daemon at webkit.org]

http://bugs.webkit.org/show_bug.cgi?id=15600





------- Comment #6 from ddkilzer at webkit.org  2007-10-21 20:29 PDT -------
(In reply to comment #5)
> Well, if update-webkit is fixed to never give you unnecessary conflicts in your
> ChangeLog, then it's less needed for prepare-ChangeLog.  In fact, I'm not sure
> why prepare-ChangeLog would ever want this functionality, as the reason why you
> have a conflict in the first place is because you already have a changelog
> entry.  Unless we're discussing updating prepare-ChangeLog to notice and update
> existing changelog entries. :)

Sometimes you want to update the ChangeLog by rerunning prepare-ChangeLog, but
don't want to clean up conflicts while you're merging the ChangeLog entries.


-- 
Configure bugmail: http://bugs.webkit.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the assignee for the bug, or are watching the assignee.