Mercurial > hg

changeset 3113:d1d1cd5b9484

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: eliminate confusing queued variable
author Matt Mackall <mpm@selenic.com>
date Sun, 17 Sep 2006 19:53:19 -0500
parents f96c8e219865
children c4e26f1ccfcc
files mercurial/merge.py
diffstat 1 files changed, 9 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Sun Sep 17 18:28:50 2006 -0500
+++ b/mercurial/merge.py	Sun Sep 17 19:53:19 2006 -0500
@@ -116,8 +116,6 @@
     # Compare manifests
     for f, n in m1.iteritems():
         if f in m2:
-            queued = 0
-
             # are files different?
             if n != m2[f]:
                 a = ma.get(f, nullid)
@@ -125,25 +123,28 @@
                 if not overwrite and n != a and m2[f] != a:
                     ui.debug(_(" %s versions differ, resolve\n") % f)
                     action.append((f, "m", fmerge(f, m1, m2, ma), n[:20], m2[f]))
-                    queued = 1
                 # are we clobbering?
                 # is remote's version newer?
                 # or are we going back in time and clean?
                 elif overwrite or m2[f] != a or (backwards and not n[20:]):
                     ui.debug(_(" remote %s is newer, get\n") % f)
                     action.append((f, "g", m2.execf(f), m2[f]))
-                    queued = 1
+                # local is newer, not overwrite, check mode bits
+                elif m1.execf(f) != m2.execf(f):
+                    mode = fmerge(f, m1, m2, ma)
+                    if mode != m1.execf(f):
+                        ui.debug(_(" updating permissions for %s\n") % f)
+                        action.append((f, "e", m2.execf(f)))
 
-            # do we still need to look at mode bits?
-            if not queued and m1.execf(f) != m2.execf(f):
+            # contents same, check mode bits
+            elif m1.execf(f) != m2.execf(f):
                 if overwrite:
                     ui.debug(_(" updating permissions for %s\n") % f)
                     action.append((f, "e", m2.execf(f)))
                 else:
                     mode = fmerge(f, m1, m2, ma)
                     if mode != m1.execf(f):
-                        ui.debug(_(" updating permissions for %s\n")
-                                      % f)
+                        ui.debug(_(" updating permissions for %s\n") % f)
                         action.append((f, "e", m2.execf(f)))
             del m2[f]
         elif f in ma: