# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 2009-06-08 23:14:44
# Node ID a8d5af707656abc049ad25fbc1abbe07f4c82175
# Parent  a964ab624385fad0fd29bc2c3f2758ccb878da06

merge: simplify backwards revert test, ready to combine with other cases

diff --git a/mercurial/merge.py b/mercurial/merge.py
--- a/mercurial/merge.py
+++ b/mercurial/merge.py
@@ -191,8 +191,7 @@ def manifestmerge(repo, p1, p2, pa, over
                         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