##// END OF EJS Templates
revert: use `set_possibly_dirty` instead of `normallookup`...
marmoute -
r48532:dc610e32 default
parent child Browse files
Show More
@@ -3610,7 +3610,7 b' def _performrevert('
3610 3610 # to report the file as clean. We have to use normallookup for
3611 3611 # merges to avoid losing information about merged/dirty files.
3612 3612 if p2 != repo.nullid:
3613 normal = repo.dirstate.normallookup
3613 normal = repo.dirstate.set_tracked
3614 3614 else:
3615 3615 normal = repo.dirstate.set_clean
3616 3616
@@ -3703,7 +3703,7 b' def _performrevert('
3703 3703 checkout(f)
3704 3704 repo.dirstate.set_tracked(f)
3705 3705
3706 normal = repo.dirstate.normallookup
3706 normal = repo.dirstate.set_tracked
3707 3707 if node == parent and p2 == repo.nullid:
3708 3708 normal = repo.dirstate.set_clean
3709 3709 for f in actions[b'undelete'][0]:
General Comments 0
You need to be logged in to leave comments. Login now