Show More
@@ -609,7 +609,7 b' def update(repo, node, branchmerge, forc' | |||
|
609 | 609 | raise util.Abort(_("update spans branches, use 'hg merge' " |
|
610 | 610 | "or 'hg update -C' to lose changes")) |
|
611 | 611 | if branchmerge and not forcemerge: |
|
612 | if wc.files(): | |
|
612 | if wc.files() or wc.deleted(): | |
|
613 | 613 | raise util.Abort(_("outstanding uncommitted changes")) |
|
614 | 614 | |
|
615 | 615 | ### calculate phase |
General Comments 0
You need to be logged in to leave comments.
Login now