Mercurial > hg-stable

changeset 8746:84c44c9ed555

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: combine three identical 'remote is newer' cases
author Matt Mackall <mpm@selenic.com>
date Mon, 08 Jun 2009 18:14:44 -0500
parents 8fd6f6b8b37d
children 9b3fd8ab3558
files mercurial/merge.py
diffstat 1 files changed, 1 insertions(+), 8 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
@@ -186,14 +186,7 @@
                     act("versions differ", "m", f, f, f, rflags, False)
                 # is remote's version newer?
                 elif m2[f] != a:
-                    # are we clobbering?
-                    if overwrite:
-                        act("clobbering", "g", f, rflags)
-                    # or are we going back in time and clean?
-                    elif backwards:
-                        act("reverting", "g", f, rflags)
-                    else:
-                        act("remote is newer", "g", f, rflags)
+                    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)