Mercurial > hg

comparison tests/test-rebase-mq.t @ 18933:42b620fc89e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
rebase: switch from util.Abort to util.InterventionRequired where appropriate (bc)
author Augie Fackler <raf@durin42.com>
date Fri, 08 Feb 2013 16:27:59 -0600
parents 76b69cccb07a
children e5d9441ec281
comparison
equal deleted inserted replaced
18932:7b4b9e8ea12e 18933:42b620fc89e2
61 61
62 $ hg rebase -s 2 -d 1 62 $ hg rebase -s 2 -d 1
63 merging f 63 merging f
64 warning: conflicts during merge. 64 warning: conflicts during merge.
65 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') 65 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
66 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) 66 unresolved conflicts (see hg resolve, then hg rebase --continue)
67 [255] 67 [255]
68 68
69 Fix the 1st conflict: 69 Fix the 1st conflict:
70 70
71 $ echo mq1r1 > f 71 $ echo mq1r1 > f
72 $ hg resolve -m f 72 $ hg resolve -m f
73 $ hg rebase -c 73 $ hg rebase -c
74 merging f 74 merging f
75 warning: conflicts during merge. 75 warning: conflicts during merge.
76 merging f incomplete! (edit conflicts, then use 'hg resolve --mark') 76 merging f incomplete! (edit conflicts, then use 'hg resolve --mark')
77 abort: unresolved conflicts (see hg resolve, then hg rebase --continue) 77 unresolved conflicts (see hg resolve, then hg rebase --continue)
78 [255] 78 [255]
79 79
80 Fix the 2nd conflict: 80 Fix the 2nd conflict:
81 81
82 $ echo mq1r1mq2 > f 82 $ echo mq1r1mq2 > f