Show More
@@ -1625,8 +1625,8 b' class localrepository(object):' | |||||
1625 | ms = mergemod.mergestate.read(self) |
|
1625 | ms = mergemod.mergestate.read(self) | |
1626 |
|
1626 | |||
1627 | if list(ms.unresolved()): |
|
1627 | if list(ms.unresolved()): | |
1628 |
raise error.Abort(_( |
|
1628 | raise error.Abort(_("unresolved merge conflicts " | |
1629 |
' |
|
1629 | "(see 'hg help resolve')")) | |
1630 | if ms.mdstate() != 's' or list(ms.driverresolved()): |
|
1630 | if ms.mdstate() != 's' or list(ms.driverresolved()): | |
1631 | raise error.Abort(_('driver-resolved merge conflicts'), |
|
1631 | raise error.Abort(_('driver-resolved merge conflicts'), | |
1632 | hint=_('run "hg resolve --all" to resolve')) |
|
1632 | hint=_('run "hg resolve --all" to resolve')) |
@@ -34,7 +34,7 b' Correct the conflict without marking the' | |||||
34 |
|
34 | |||
35 | $ echo "ABCD" > A |
|
35 | $ echo "ABCD" > A | |
36 | $ hg commit -m "Merged" |
|
36 | $ hg commit -m "Merged" | |
37 |
abort: unresolved merge conflicts (see |
|
37 | abort: unresolved merge conflicts (see 'hg help resolve') | |
38 | [255] |
|
38 | [255] | |
39 |
|
39 | |||
40 | Mark the conflict as resolved and commit |
|
40 | Mark the conflict as resolved and commit | |
@@ -56,7 +56,7 b' Test that if a file is removed but not m' | |||||
56 | [1] |
|
56 | [1] | |
57 | $ hg rm --force A |
|
57 | $ hg rm --force A | |
58 | $ hg commit -m merged |
|
58 | $ hg commit -m merged | |
59 |
abort: unresolved merge conflicts (see |
|
59 | abort: unresolved merge conflicts (see 'hg help resolve') | |
60 | [255] |
|
60 | [255] | |
61 |
|
61 | |||
62 | $ hg resolve -ma |
|
62 | $ hg resolve -ma |
@@ -253,7 +253,7 b' Continue without resolve should fail:' | |||||
253 |
|
253 | |||
254 | $ hg graft -c |
|
254 | $ hg graft -c | |
255 | grafting 4:9c233e8e184d "4" |
|
255 | grafting 4:9c233e8e184d "4" | |
256 |
abort: unresolved merge conflicts (see |
|
256 | abort: unresolved merge conflicts (see 'hg help resolve') | |
257 | [255] |
|
257 | [255] | |
258 |
|
258 | |||
259 | Fix up: |
|
259 | Fix up: |
@@ -75,7 +75,7 b' Try to continue without solving the conf' | |||||
75 | $ hg rebase --continue |
|
75 | $ hg rebase --continue | |
76 | already rebased 3:3163e20567cc "L1" as 3e046f2ecedb |
|
76 | already rebased 3:3163e20567cc "L1" as 3e046f2ecedb | |
77 | rebasing 4:46f0b057b5c0 "L2" |
|
77 | rebasing 4:46f0b057b5c0 "L2" | |
78 |
abort: unresolved merge conflicts (see |
|
78 | abort: unresolved merge conflicts (see 'hg help resolve') | |
79 | [255] |
|
79 | [255] | |
80 |
|
80 | |||
81 | Conclude rebase: |
|
81 | Conclude rebase: |
@@ -719,7 +719,7 b' m "um a c" "um x c" " " "10 do merg' | |||||
719 | -------------- |
|
719 | -------------- | |
720 | M a |
|
720 | M a | |
721 | M b |
|
721 | M b | |
722 |
abort: unresolved merge conflicts (see |
|
722 | abort: unresolved merge conflicts (see 'hg help resolve') | |
723 | -------------- |
|
723 | -------------- | |
724 |
|
724 | |||
725 | $ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a" |
|
725 | $ tm "up a b" "nm a b" " " "19 merge b no ancestor, prompt remove a" | |
@@ -764,7 +764,7 b' m "um a c" "um x c" " " "10 do merg' | |||||
764 | -------------- |
|
764 | -------------- | |
765 | M b |
|
765 | M b | |
766 | C a |
|
766 | C a | |
767 |
abort: unresolved merge conflicts (see |
|
767 | abort: unresolved merge conflicts (see 'hg help resolve') | |
768 | -------------- |
|
768 | -------------- | |
769 |
|
769 | |||
770 | $ tm "up a " "um a b" " " "20 merge a and b to b, remove a" |
|
770 | $ tm "up a " "um a b" " " "20 merge a and b to b, remove a" |
General Comments 0
You need to be logged in to leave comments.
Login now