[Webkit-unassigned] [Bug 15600] update-webkit creates needless ChangeLog conflicts

bugzilla-daemon at webkit.org bugzilla-daemon at webkit.org
Sun Oct 21 16:22:56 PDT 2007


------- Comment #3 from mjs at apple.com  2007-10-21 16:22 PDT -------
I'd definitely love to see better conflict avoidance in prepare-ChangeLog. But
does just removing the conflict markers always do the right thing? I am not so
sure, because I think at times I have seen content duplicated in the two
conflict alternatives in such a way that just removing the markers would lead
to a broken ChangeLog. What would work better is something like this:

If ChangeLog local changes are only lines at the top, save them, remove them,
update ChangeLog, then paste new lines back at the top. I'd love to see a
version like that folded into prepare-ChangeLog.

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.

More information about the webkit-unassigned mailing list