Show More
@@ -714,7 +714,7 b' def updatetotally(ui, repo, checkout, br' | |||||
714 |
|
714 | |||
715 | This returns whether conflict is detected at updating or not. |
|
715 | This returns whether conflict is detected at updating or not. | |
716 | """ |
|
716 | """ | |
717 | if True: |
|
717 | with repo.wlock(): | |
718 | movemarkfrom = None |
|
718 | movemarkfrom = None | |
719 | warndest = False |
|
719 | warndest = False | |
720 | if checkout is None: |
|
720 | if checkout is None: |
General Comments 0
You need to be logged in to leave comments.
Login now