# HG changeset patch
# User Matt Mackall <mpm@selenic.com>
# Date 1244502884 18000
# Node ID a1808b40a8fb611826c87d80aa6c49a1e40aa1b6
# Parent  7619b16ea880026696eb7e6ede5e417b0123dc05
merge: reorder get cases for future simplification

diff -r 7619b16ea880 -r a1808b40a8fb mercurial/merge.py
--- a/mercurial/merge.py	Mon Jun 08 18:14:44 2009 -0500
+++ b/mercurial/merge.py	Mon Jun 08 18:14:44 2009 -0500
@@ -178,19 +178,20 @@
             # are files different?
             if n != m2[f]:
                 a = ma.get(f, nullid)
-                # are we clobbering?
-                if overwrite:
-                    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)
                 # are both different from the ancestor?
-                elif n != a and m2[f] != a:
+                if n != a and m2[f] != a:
                     act("versions differ", "m", f, f, f, rflags, False)
                 # is remote's version newer?
                 elif m2[f] != a:
-                    act("remote is newer", "g", f, rflags)
+                    # are we clobbering?
+                    if overwrite:
+                        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)
+                    else:
+                        act("remote is newer", "g", f, rflags)
                 # local is newer, not overwrite, check mode bits
                 elif m1.flags(f) != rflags:
                     act("update permissions", "e", f, rflags)