Show More
@@ -15,7 +15,7 b' http://mercurial.selenic.com/wiki/Rebase' | |||
|
15 | 15 | ''' |
|
16 | 16 | |
|
17 | 17 | from mercurial import hg, util, repair, merge, cmdutil, commands, bookmarks |
|
18 | from mercurial import extensions, patch, scmutil, phases, obsolete | |
|
18 | from mercurial import extensions, patch, scmutil, phases, obsolete, error | |
|
19 | 19 | from mercurial.commands import templateopts |
|
20 | 20 | from mercurial.node import nullrev |
|
21 | 21 | from mercurial.lock import release |
@@ -269,8 +269,9 b' def rebase(ui, repo, **opts):' | |||
|
269 | 269 | ui.setconfig('ui', 'forcemerge', opts.get('tool', '')) |
|
270 | 270 | stats = rebasenode(repo, rev, p1, state, collapsef) |
|
271 | 271 | if stats and stats[3] > 0: |
|
272 |
raise |
|
|
273 |
|
|
|
272 | raise error.InterventionRequired( | |
|
273 | _('unresolved conflicts (see hg ' | |
|
274 | 'resolve, then hg rebase --continue)')) | |
|
274 | 275 | finally: |
|
275 | 276 | ui.setconfig('ui', 'forcemerge', '') |
|
276 | 277 | cmdutil.duplicatecopies(repo, rev, target) |
@@ -55,7 +55,7 b' Conflicting rebase:' | |||
|
55 | 55 | merging common |
|
56 | 56 | warning: conflicts during merge. |
|
57 | 57 | merging common incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
58 |
|
|
|
58 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
|
59 | 59 | [255] |
|
60 | 60 | |
|
61 | 61 | Abort: |
@@ -126,7 +126,7 b' Rebase and abort without generating new ' | |||
|
126 | 126 | merging c |
|
127 | 127 | warning: conflicts during merge. |
|
128 | 128 | merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
129 |
|
|
|
129 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
|
130 | 130 | [255] |
|
131 | 131 | |
|
132 | 132 | $ hg tglog |
@@ -141,7 +141,7 b' rebase --continue with bookmarks present' | |||
|
141 | 141 | merging c |
|
142 | 142 | warning: conflicts during merge. |
|
143 | 143 | merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
144 |
|
|
|
144 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
|
145 | 145 | [255] |
|
146 | 146 | $ echo 'c' > c |
|
147 | 147 | $ hg resolve --mark c |
@@ -69,7 +69,7 b' Rebasing B onto E - check keep: and phas' | |||
|
69 | 69 | merging A |
|
70 | 70 | warning: conflicts during merge. |
|
71 | 71 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
72 |
|
|
|
72 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
|
73 | 73 | [255] |
|
74 | 74 | |
|
75 | 75 | Solve the conflict and go on: |
@@ -122,7 +122,7 b' Rebase F onto E - check keepbranches:' | |||
|
122 | 122 | merging A |
|
123 | 123 | warning: conflicts during merge. |
|
124 | 124 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
125 |
|
|
|
125 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
|
126 | 126 | [255] |
|
127 | 127 | |
|
128 | 128 | Solve the conflict and go on: |
@@ -65,7 +65,7 b' Conflicting rebase:' | |||
|
65 | 65 | merging common |
|
66 | 66 | warning: conflicts during merge. |
|
67 | 67 | merging common incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
68 |
|
|
|
68 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
|
69 | 69 | [255] |
|
70 | 70 | |
|
71 | 71 | Try to continue without solving the conflict: |
@@ -372,7 +372,7 b' Ensure --continue restores a correct sta' | |||
|
372 | 372 | merging H |
|
373 | 373 | warning: conflicts during merge. |
|
374 | 374 | merging H incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
375 |
|
|
|
375 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
|
376 | 376 | [255] |
|
377 | 377 | $ hg resolve --all -t internal:local |
|
378 | 378 | $ hg rebase -c |
@@ -61,7 +61,7 b' Rebasing B onto E:' | |||
|
61 | 61 | merging A |
|
62 | 62 | warning: conflicts during merge. |
|
63 | 63 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
64 |
|
|
|
64 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
|
65 | 65 | [255] |
|
66 | 66 | |
|
67 | 67 | Force a commit on C during the interruption: |
@@ -97,7 +97,7 b' Resume the rebasing:' | |||
|
97 | 97 | merging A |
|
98 | 98 | warning: conflicts during merge. |
|
99 | 99 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
100 |
|
|
|
100 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
|
101 | 101 | [255] |
|
102 | 102 | |
|
103 | 103 | Solve the conflict and go on: |
@@ -151,7 +151,7 b' Rebasing B onto E:' | |||
|
151 | 151 | merging A |
|
152 | 152 | warning: conflicts during merge. |
|
153 | 153 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
154 |
|
|
|
154 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
|
155 | 155 | [255] |
|
156 | 156 | |
|
157 | 157 | Force a commit on B' during the interruption: |
@@ -222,7 +222,7 b' Rebasing B onto E:' | |||
|
222 | 222 | merging A |
|
223 | 223 | warning: conflicts during merge. |
|
224 | 224 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
225 |
|
|
|
225 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
|
226 | 226 | [255] |
|
227 | 227 | |
|
228 | 228 | Change phase on B and B' |
@@ -108,7 +108,7 b' already has one local mq patch' | |||
|
108 | 108 | $ hg up -q qtip |
|
109 | 109 | |
|
110 | 110 | $ HGMERGE=internal:fail hg rebase |
|
111 |
|
|
|
111 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
|
112 | 112 | [255] |
|
113 | 113 | |
|
114 | 114 | $ HGMERGE=internal:local hg resolve --all |
@@ -63,7 +63,7 b' Rebase - generate a conflict:' | |||
|
63 | 63 | merging f |
|
64 | 64 | warning: conflicts during merge. |
|
65 | 65 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
66 |
|
|
|
66 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
|
67 | 67 | [255] |
|
68 | 68 | |
|
69 | 69 | Fix the 1st conflict: |
@@ -74,7 +74,7 b' Fix the 1st conflict:' | |||
|
74 | 74 | merging f |
|
75 | 75 | warning: conflicts during merge. |
|
76 | 76 | merging f incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
77 |
|
|
|
77 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
|
78 | 78 | [255] |
|
79 | 79 | |
|
80 | 80 | Fix the 2nd conflict: |
@@ -416,7 +416,7 b' Test --tool parameter:' | |||
|
416 | 416 | $ cd b3 |
|
417 | 417 | |
|
418 | 418 | $ hg rebase -s 2 -d 1 --tool internal:fail |
|
419 |
|
|
|
419 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
|
420 | 420 | [255] |
|
421 | 421 | |
|
422 | 422 | $ hg resolve -l |
General Comments 0
You need to be logged in to leave comments.
Login now