Mercurial > public > mercurial-scm > hg

comparison 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
comparison
equal deleted inserted replaced
23408:36dcd3db70ab 23410:cd9e5e57064d
455 if n1 != ma[f]: 455 if n1 != ma[f]:
456 if acceptremote: 456 if acceptremote:
457 actions['r'].append((f, None, "remote delete")) 457 actions['r'].append((f, None, "remote delete"))
458 else: 458 else:
459 actions['cd'].append((f, None, "prompt changed/deleted")) 459 actions['cd'].append((f, None, "prompt changed/deleted"))
460 elif n1[20:] == 'a': # added, no remote 460 elif n1[20:] == 'a':
461 # This extra 'a' is added by working copy manifest to mark the
462 # file as locally added. We should forget it instead of
463 # deleting it.
461 actions['f'].append((f, None, "remote deleted")) 464 actions['f'].append((f, None, "remote deleted"))
462 else: 465 else:
463 actions['r'].append((f, None, "other deleted")) 466 actions['r'].append((f, None, "other deleted"))
464 elif n2 and f in movewithdir: 467 elif n2 and f in movewithdir:
465 f2 = movewithdir[f] 468 f2 = movewithdir[f]