##// END OF EJS Templates
dirstate: drop duplicated check...
marmoute -
r48470:ec1d63e6 default
parent child Browse files
Show More
@@ -560,9 +560,6 b' class dirstate(object):'
560 depending of what information ends up being relevant and useful to
560 depending of what information ends up being relevant and useful to
561 other processing.
561 other processing.
562 """
562 """
563 if not self.pendingparentchange():
564 msg = b'calling `update_file` outside of a parentchange context'
565 raise error.ProgrammingError(msg)
566 if merged and (clean_p1 or clean_p2):
563 if merged and (clean_p1 or clean_p2):
567 msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
564 msg = b'`merged` argument incompatible with `clean_p1`/`clean_p2`'
568 raise error.ProgrammingError(msg)
565 raise error.ProgrammingError(msg)
General Comments 0
You need to be logged in to leave comments. Login now