Mercurial > public > mercurial-scm > hg

comparison mercurial/cmdutil.py @ 22189:cde6b489365c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
revert: drop special case handling for file unknown in parent We had a special case for file not caught by any categories. It was aimed at files missing in wc and wc's parent but existing in the target revision. This is now properly handled using status information.
author Pierre-Yves David <pierre-yves.david@fb.com>
date Tue, 24 Jun 2014 16:57:16 +0100
parents 0ad619c5e1a4
children 55308ab8117c
comparison
equal deleted inserted replaced
22188:0ad619c5e1a4 22189:cde6b489365c
2493 else: 2493 else:
2494 # Not touched in current dirstate. 2494 # Not touched in current dirstate.
2495 2495
2496 # file is unknown in parent, restore older version or ignore. 2496 # file is unknown in parent, restore older version or ignore.
2497 if abs not in repo.dirstate: 2497 if abs not in repo.dirstate:
2498 if mfentry: 2498 if exact:
2499 handle(actions['add'], True)
2500 elif exact:
2501 ui.warn(_('file not managed: %s\n') % rel) 2499 ui.warn(_('file not managed: %s\n') % rel)
2502 continue 2500 continue
2503 2501
2504 # parent is target, no changes mean no changes 2502 # parent is target, no changes mean no changes
2505 if node == parent: 2503 if node == parent: