https://bz.mercurial-scm.org/show_bug.cgi?id=6202
Bug ID: 6202
Summary: Evolve should preserve date when resolving
content-divergence
Product: Mercurial
Version: unspecified
Hardware: PC
OS: Linux
Status: UNCONFIRMED
Severity: bug
Priority: wish
Component: evolution
Assignee: bugzi...@mercurial-scm.org
Reporter: m...@manueljacob.de
CC: mercurial-devel@mercurial-scm.org,
pierre-yves.da...@ens-lyon.org
Currently hg evolve doesn’t even try to preserve the date when resolving
content-divergence. I propose to take the newest date from both sides of the
content-divergence. This does the right thing in the common case when the date
wasn’t changed on either side compared to the base.
--
You are receiving this mail because:
You are on the CC list for the bug.
_______________________________________________
Mercurial-devel mailing list
Mercurial-devel@mercurial-scm.org
https://www.mercurial-scm.org/mailman/listinfo/mercurial-devel
