Mercurial > hg
comparison mercurial/merge.py @ 23387:3eb99f8e9a62
merge: remove obsolete check for untracked files in 'dm' action
Since 0776a6cababe (merge: don't use unknown(), 2012-02-09), untracked
files are no longer included in the manifest diff, so there is no need
to check exclude them when renaming files for directory moves with the
'dm' action.
author | Martin von Zweigbergk <martinvonz@google.com> |
---|---|
date | Mon, 24 Nov 2014 09:50:27 -0800 |
parents | 8229f32d2b79 |
children | d9ebb475eede |
comparison
equal
deleted
inserted
replaced
23386:8229f32d2b79 | 23387:3eb99f8e9a62 |
---|---|
894 repo.dirstate.drop(f1) | 894 repo.dirstate.drop(f1) |
895 | 895 |
896 # directory rename, move local | 896 # directory rename, move local |
897 for f, args, msg in actions['dm']: | 897 for f, args, msg in actions['dm']: |
898 f0, flag = args | 898 f0, flag = args |
899 if f0 not in repo.dirstate: | |
900 # untracked file moved | |
901 continue | |
902 if branchmerge: | 899 if branchmerge: |
903 repo.dirstate.add(f) | 900 repo.dirstate.add(f) |
904 repo.dirstate.remove(f0) | 901 repo.dirstate.remove(f0) |
905 repo.dirstate.copy(f0, f) | 902 repo.dirstate.copy(f0, f) |
906 else: | 903 else: |