Mercurial > public > mercurial-scm > hg

diff mercurial/merge.py @ 23410:cd9e5e57064d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
manifest: document the extra letter in working copy manifest node As the second developer to get confused by this in November, I'm adding some documentation for the next poor soul.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Wed, 26 Nov 2014 15:37:01 -0800
parents 2a038deeac9a
children 19ebd2f88fc7
line wrap: on
line diff
--- a/mercurial/merge.py	Sun Nov 30 20:06:53 2014 +0100
+++ b/mercurial/merge.py	Wed Nov 26 15:37:01 2014 -0800
@@ -457,7 +457,10 @@
                     actions['r'].append((f, None, "remote delete"))
                 else:
                     actions['cd'].append((f, None, "prompt changed/deleted"))
-            elif n1[20:] == 'a': # added, no remote
+            elif n1[20:] == 'a':
+                # This extra 'a' is added by working copy manifest to mark the
+                # file as locally added. We should forget it instead of
+                # deleting it.
                 actions['f'].append((f, None, "remote deleted"))
             else:
                 actions['r'].append((f, None, "other deleted"))