Mercurial Mercurial > hg / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | zip | gz | bz2 | help
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
authorPierre-Yves David <pierre-yves.david@fb.com>
Tue, 24 Jun 2014 16:57:16 +0100
changeset 22189 cde6b489365c
parent 22188 0ad619c5e1a4
child 22190 55308ab8117c
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.
mercurial/cmdutil.py file | annotate | diff | comparison | revisions 
--- a/mercurial/cmdutil.py	Tue Jun 24 16:53:22 2014 +0100
+++ b/mercurial/cmdutil.py	Tue Jun 24 16:57:16 2014 +0100
@@ -2495,9 +2495,7 @@
 
                 # file is unknown in parent, restore older version or ignore.
                 if abs not in repo.dirstate:
-                    if mfentry:
-                        handle(actions['add'], True)
-                    elif exact:
+                    if exact:
                         ui.warn(_('file not managed: %s\n') % rel)
                     continue
Mercurial