Show More
@@ -5723,6 +5723,7 b' def update(ui, repo, node=None, rev=None' | |||||
5723 | raise util.Abort(_("uncommitted local changes")) |
|
5723 | raise util.Abort(_("uncommitted local changes")) | |
5724 | if not rev: |
|
5724 | if not rev: | |
5725 | rev = repo[repo[None].branch()].rev() |
|
5725 | rev = repo[repo[None].branch()].rev() | |
|
5726 | mergemod._checkunknown(repo, repo[None], repo[rev]) | |||
5726 |
|
5727 | |||
5727 | if clean: |
|
5728 | if clean: | |
5728 | ret = hg.clean(repo, rev) |
|
5729 | ret = hg.clean(repo, rev) |
@@ -545,6 +545,8 b' def update(repo, node, branchmerge, forc' | |||||
545 | if not force and (wc.files() or wc.deleted()): |
|
545 | if not force and (wc.files() or wc.deleted()): | |
546 | raise util.Abort(_("outstanding uncommitted changes"), |
|
546 | raise util.Abort(_("outstanding uncommitted changes"), | |
547 | hint=_("use 'hg status' to list changes")) |
|
547 | hint=_("use 'hg status' to list changes")) | |
|
548 | if not force: | |||
|
549 | _checkunknown(repo, wc, p2) | |||
548 | for s in wc.substate: |
|
550 | for s in wc.substate: | |
549 | if wc.sub(s).dirty(): |
|
551 | if wc.sub(s).dirty(): | |
550 | raise util.Abort(_("outstanding uncommitted changes in " |
|
552 | raise util.Abort(_("outstanding uncommitted changes in " | |
@@ -566,8 +568,6 b' def update(repo, node, branchmerge, forc' | |||||
566 | ### calculate phase |
|
568 | ### calculate phase | |
567 | action = [] |
|
569 | action = [] | |
568 | folding = not util.checkcase(repo.path) |
|
570 | folding = not util.checkcase(repo.path) | |
569 | if not force: |
|
|||
570 | _checkunknown(repo, wc, p2) |
|
|||
571 | if folding: |
|
571 | if folding: | |
572 | _checkcollision(p2, branchmerge and p1) |
|
572 | _checkcollision(p2, branchmerge and p1) | |
573 | action += _forgetremoved(wc, p2, branchmerge) |
|
573 | action += _forgetremoved(wc, p2, branchmerge) |
General Comments 0
You need to be logged in to leave comments.
Login now