Show More
@@ -5363,9 +5363,6 b' def update(ui, repo, node=None, rev=None' | |||||
5363 | brev = rev |
|
5363 | brev = rev | |
5364 | rev = scmutil.revsingle(repo, rev, rev).rev() |
|
5364 | rev = scmutil.revsingle(repo, rev, rev).rev() | |
5365 |
|
5365 | |||
5366 | if check: |
|
|||
5367 | cmdutil.bailifchanged(repo, merge=False) |
|
|||
5368 |
|
||||
5369 | repo.ui.setconfig('ui', 'forcemerge', tool, 'update') |
|
5366 | repo.ui.setconfig('ui', 'forcemerge', tool, 'update') | |
5370 |
|
5367 | |||
5371 | return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check) |
|
5368 | return hg.updatetotally(ui, repo, rev, brev, clean=clean, check=check) |
@@ -739,6 +739,8 b' def updatetotally(ui, repo, checkout, br' | |||||
739 | if clean: |
|
739 | if clean: | |
740 | ret = _clean(repo, checkout) |
|
740 | ret = _clean(repo, checkout) | |
741 | else: |
|
741 | else: | |
|
742 | if check: | |||
|
743 | cmdutil.bailifchanged(repo, merge=False) | |||
742 | ret = _update(repo, checkout) |
|
744 | ret = _update(repo, checkout) | |
743 |
|
745 | |||
744 | if not ret and movemarkfrom: |
|
746 | if not ret and movemarkfrom: |
General Comments 0
You need to be logged in to leave comments.
Login now