##// END OF EJS Templates
merge: remove obsolete check for untracked files in 'dm' action...
Martin von Zweigbergk -
r23387:3eb99f8e default
parent child Browse files
Show More
@@ -896,9 +896,6 def recordupdates(repo, actions, branchm
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)
General Comments 0
You need to be logged in to leave comments. Login now