Mercurial > hg

changeset 991:b634b15c020b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge: remove remaining mark bits
author mpm@selenic.com
date Sun, 21 Aug 2005 22:03:36 -0700
parents 5007e0bdeed2
children f859e9cba1b9 b0e581438835
files mercurial/hg.py
diffstat 1 files changed, 0 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/mercurial/hg.py	Sun Aug 21 21:59:55 2005 -0700
+++ b/mercurial/hg.py	Sun Aug 21 22:03:36 2005 -0700
@@ -1617,7 +1617,6 @@
         merge = {}
         get = {}
         remove = []
-        mark = {}
 
         # construct a working dir manifest
         mw = m1.copy()
@@ -1650,7 +1649,6 @@
                     t1 = self.wfile(f).read()
                     t2 = self.file(f).revision(m2[f])
                     if cmp(t1, t2) == 0:
-                        mark[f] = 1
                         n = m2[f]
                     del t1, t2
 
@@ -1673,8 +1671,6 @@
                         self.ui.debug(" remote %s is newer, get\n" % f)
                         get[f] = m2[f]
                         s = 1
-                    else:
-                        mark[f] = 1
                 elif f in umap:
                     # this unknown file is the same as the checkout
                     get[f] = m2[f]
@@ -1689,7 +1685,6 @@
                         if mode != b:
                             self.ui.debug(" updating permissions for %s\n" % f)
                             util.set_exec(self.wjoin(f), mode)
-                            mark[f] = 1
                 del m2[f]
             elif f in ma:
                 if n != ma[f]: