##// END OF EJS Templates
revert: use `set_clean` instead of `normal`...
marmoute -
r48507:61753b1b default
parent child Browse files
Show More
@@ -3598,7 +3598,7 b' def _performrevert('
3598 if p2 != repo.nullid:
3598 if p2 != repo.nullid:
3599 normal = repo.dirstate.normallookup
3599 normal = repo.dirstate.normallookup
3600 else:
3600 else:
3601 normal = repo.dirstate.normal
3601 normal = repo.dirstate.set_clean
3602
3602
3603 newlyaddedandmodifiedfiles = set()
3603 newlyaddedandmodifiedfiles = set()
3604 if interactive:
3604 if interactive:
@@ -3691,7 +3691,7 b' def _performrevert('
3691
3691
3692 normal = repo.dirstate.normallookup
3692 normal = repo.dirstate.normallookup
3693 if node == parent and p2 == repo.nullid:
3693 if node == parent and p2 == repo.nullid:
3694 normal = repo.dirstate.normal
3694 normal = repo.dirstate.set_clean
3695 for f in actions[b'undelete'][0]:
3695 for f in actions[b'undelete'][0]:
3696 if interactive:
3696 if interactive:
3697 choice = repo.ui.promptchoice(
3697 choice = repo.ui.promptchoice(
General Comments 0
You need to be logged in to leave comments. Login now