equal
deleted
inserted
replaced
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: |