Mercurial > hg

changeset 8743:a8d5af707656

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: simplify backwards revert test, ready to combine with other cases
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents a964ab624385
children 6b675c781c6d
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Jun 08 18:14:44 2009 -0500
+++ b/mercurial/merge.py	Mon Jun 08 18:14:44 2009 -0500
@@ -191,8 +191,7 @@
                         act("clobbering", "g", f, rflags)
                     # or are we going back in time and clean?
                     elif backwards:
-                        if not n[20:] or not p2[f].cmp(p1[f].data()):
-                            act("reverting", "g", f, rflags)
+                        act("reverting", "g", f, rflags)
                     else:
                         act("remote is newer", "g", f, rflags)
                 # local is newer, not overwrite, check mode bits