Show More
@@ -609,7 +609,7 b' def update(repo, node, branchmerge, forc' | |||||
609 | raise util.Abort(_("update spans branches, use 'hg merge' " |
|
609 | raise util.Abort(_("update spans branches, use 'hg merge' " | |
610 | "or 'hg update -C' to lose changes")) |
|
610 | "or 'hg update -C' to lose changes")) | |
611 | if branchmerge and not forcemerge: |
|
611 | if branchmerge and not forcemerge: | |
612 | if wc.files(): |
|
612 | if wc.files() or wc.deleted(): | |
613 | raise util.Abort(_("outstanding uncommitted changes")) |
|
613 | raise util.Abort(_("outstanding uncommitted changes")) | |
614 |
|
614 | |||
615 | ### calculate phase |
|
615 | ### calculate phase |
@@ -17,7 +17,8 b' hg up -qC 1' | |||||
17 | rm a |
|
17 | rm a | |
18 |
|
18 | |||
19 | echo '% local deleted a file, remote removed' |
|
19 | echo '% local deleted a file, remote removed' | |
20 | hg -v merge |
|
20 | hg merge # should fail, since there are deleted files | |
|
21 | hg -v merge --force | |||
21 | echo % should show a as removed |
|
22 | echo % should show a as removed | |
22 | hg st |
|
23 | hg st | |
23 |
|
24 |
@@ -1,4 +1,5 b'' | |||||
1 | % local deleted a file, remote removed |
|
1 | % local deleted a file, remote removed | |
|
2 | abort: outstanding uncommitted changes | |||
2 | resolving manifests |
|
3 | resolving manifests | |
3 | removing a |
|
4 | removing a | |
4 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
5 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now