##// END OF EJS Templates
mq: use `update_file_p1` instead of `remove` when adjusting dirstate...
marmoute -
r48497:c9e41271 default
parent child Browse files
Show More
@@ -1099,7 +1099,7 b' class queue(object):'
1099 removed.append(f)
1099 removed.append(f)
1100 with repo.dirstate.parentchange():
1100 with repo.dirstate.parentchange():
1101 for f in removed:
1101 for f in removed:
1102 repo.dirstate.remove(f)
1102 repo.dirstate.update_file_p1(f, p1_tracked=True)
1103 for f in merged:
1103 for f in merged:
1104 repo.dirstate.merge(f)
1104 repo.dirstate.merge(f)
1105 p1 = repo.dirstate.p1()
1105 p1 = repo.dirstate.p1()
@@ -2038,7 +2038,7 b' class queue(object):'
2038 for f in list(repo.dirstate.copies()):
2038 for f in list(repo.dirstate.copies()):
2039 repo.dirstate.copy(None, f)
2039 repo.dirstate.copy(None, f)
2040 for f in r:
2040 for f in r:
2041 repo.dirstate.remove(f)
2041 repo.dirstate.update_file_p1(f, p1_tracked=True)
2042 # if the patch excludes a modified file, mark that
2042 # if the patch excludes a modified file, mark that
2043 # file with mtime=0 so status can see it.
2043 # file with mtime=0 so status can see it.
2044 mm = []
2044 mm = []
General Comments 0
You need to be logged in to leave comments. Login now