Mercurial > hg

changeset 2969:833677bc9791

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: rename mysterious variable
author Matt Mackall <mpm@selenic.com>
date Mon, 21 Aug 2006 14:25:56 -0500
parents 545d33aa3f82
children fa9c769fee8a
files mercurial/merge.py
diffstat 1 files changed, 5 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/merge.py	Mon Aug 21 14:21:42 2006 -0500
+++ b/mercurial/merge.py	Mon Aug 21 14:25:56 2006 -0500
@@ -145,7 +145,7 @@
         if partial and not partial(f):
             continue
         if f in m2:
-            s = 0
+            queued = 0
 
             # are files different?
             if n != m2[f]:
@@ -154,20 +154,21 @@
                 if n != a and m2[f] != a:
                     repo.ui.debug(_(" %s versions differ, resolve\n") % f)
                     merge[f] = (fmerge(f, mw, m2, ma), m1.get(f, nullid), m2[f])
-                    s = 1
+                    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 mw[f] == m1[f]):
                     repo.ui.debug(_(" remote %s is newer, get\n") % f)
                     get[f] = (m2.execf(f), m2[f])
-                    s = 1
+                    queued = 1
             elif f in umap or f in added:
                 # this unknown file is the same as the checkout
                 # we need to reset the dirstate if the file was added
                 get[f] = (m2.execf(f), m2[f])
 
-            if not s and mw.execf(f) != m2.execf(f):
+            # do we still need to look at mode bits?
+            if not queued and mw.execf(f) != m2.execf(f):
                 if overwrite:
                     repo.ui.debug(_(" updating permissions for %s\n") % f)
                     util.set_exec(repo.wjoin(f), m2.execf(f))