Show More
@@ -153,6 +153,7 b' def _runcatch(req):' | |||||
153 | commands.help_(ui, 'shortlist') |
|
153 | commands.help_(ui, 'shortlist') | |
154 | except error.InterventionRequired, inst: |
|
154 | except error.InterventionRequired, inst: | |
155 | ui.warn("%s\n" % inst) |
|
155 | ui.warn("%s\n" % inst) | |
|
156 | return 1 | |||
156 | except util.Abort, inst: |
|
157 | except util.Abort, inst: | |
157 | ui.warn(_("abort: %s\n") % inst) |
|
158 | ui.warn(_("abort: %s\n") % inst) | |
158 | if inst.hint: |
|
159 | if inst.hint: |
@@ -183,7 +183,7 b' folding and creating no new change doesn' | |||||
183 | warning: conflicts during merge. |
|
183 | warning: conflicts during merge. | |
184 | merging file incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
184 | merging file incomplete! (edit conflicts, then use 'hg resolve --mark') | |
185 | Fix up the change and run hg histedit --continue |
|
185 | Fix up the change and run hg histedit --continue | |
186 |
[ |
|
186 | [1] | |
187 | There were conflicts, we keep P1 content. This |
|
187 | There were conflicts, we keep P1 content. This | |
188 | should effectively drop the changes from +6. |
|
188 | should effectively drop the changes from +6. | |
189 | $ hg status |
|
189 | $ hg status | |
@@ -248,7 +248,7 b' dropped revision.' | |||||
248 | warning: conflicts during merge. |
|
248 | warning: conflicts during merge. | |
249 | merging file incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
249 | merging file incomplete! (edit conflicts, then use 'hg resolve --mark') | |
250 | Fix up the change and run hg histedit --continue |
|
250 | Fix up the change and run hg histedit --continue | |
251 |
[ |
|
251 | [1] | |
252 | $ cat > file << EOF |
|
252 | $ cat > file << EOF | |
253 | > 1 |
|
253 | > 1 | |
254 | > 2 |
|
254 | > 2 |
@@ -141,7 +141,7 b' Test that rewriting leaving instability ' | |||||
141 | adding c |
|
141 | adding c | |
142 | Make changes as needed, you may commit or record as needed now. |
|
142 | Make changes as needed, you may commit or record as needed now. | |
143 | When you are finished, run hg histedit --continue to resume. |
|
143 | When you are finished, run hg histedit --continue to resume. | |
144 |
[ |
|
144 | [1] | |
145 | $ echo c >> c |
|
145 | $ echo c >> c | |
146 | $ hg histedit --continue |
|
146 | $ hg histedit --continue | |
147 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
147 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -280,7 +280,7 b' New-commit as draft (default)' | |||||
280 | adding f |
|
280 | adding f | |
281 | Make changes as needed, you may commit or record as needed now. |
|
281 | Make changes as needed, you may commit or record as needed now. | |
282 | When you are finished, run hg histedit --continue to resume. |
|
282 | When you are finished, run hg histedit --continue to resume. | |
283 |
[ |
|
283 | [1] | |
284 | $ echo f >> f |
|
284 | $ echo f >> f | |
285 | $ hg histedit --continue |
|
285 | $ hg histedit --continue | |
286 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
286 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
@@ -330,7 +330,7 b' New-commit as draft (default)' | |||||
330 | adding f |
|
330 | adding f | |
331 | Make changes as needed, you may commit or record as needed now. |
|
331 | Make changes as needed, you may commit or record as needed now. | |
332 | When you are finished, run hg histedit --continue to resume. |
|
332 | When you are finished, run hg histedit --continue to resume. | |
333 |
[ |
|
333 | [1] | |
334 | $ echo f >> f |
|
334 | $ echo f >> f | |
335 | $ hg histedit --continue |
|
335 | $ hg histedit --continue | |
336 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
336 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -56,7 +56,7 b' Conflicting rebase:' | |||||
56 | warning: conflicts during merge. |
|
56 | warning: conflicts during merge. | |
57 | merging common incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
57 | merging common incomplete! (edit conflicts, then use 'hg resolve --mark') | |
58 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
58 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
59 |
[ |
|
59 | [1] | |
60 |
|
60 | |||
61 | Abort: |
|
61 | Abort: | |
62 |
|
62 | |||
@@ -127,7 +127,7 b' Rebase and abort without generating new ' | |||||
127 | warning: conflicts during merge. |
|
127 | warning: conflicts during merge. | |
128 | merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
128 | merging c incomplete! (edit conflicts, then use 'hg resolve --mark') | |
129 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
129 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
130 |
[ |
|
130 | [1] | |
131 |
|
131 | |||
132 | $ hg tglog |
|
132 | $ hg tglog | |
133 | @ 4:draft 'C1' |
|
133 | @ 4:draft 'C1' |
@@ -142,7 +142,7 b' rebase --continue with bookmarks present' | |||||
142 | warning: conflicts during merge. |
|
142 | warning: conflicts during merge. | |
143 | merging c incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
143 | merging c incomplete! (edit conflicts, then use 'hg resolve --mark') | |
144 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
144 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
145 |
[ |
|
145 | [1] | |
146 | $ echo 'c' > c |
|
146 | $ echo 'c' > c | |
147 | $ hg resolve --mark c |
|
147 | $ hg resolve --mark c | |
148 | $ hg rebase --continue |
|
148 | $ hg rebase --continue |
@@ -70,7 +70,7 b' Rebasing B onto E - check keep: and phas' | |||||
70 | warning: conflicts during merge. |
|
70 | warning: conflicts during merge. | |
71 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
71 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | |
72 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
72 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
73 |
[ |
|
73 | [1] | |
74 |
|
74 | |||
75 | Solve the conflict and go on: |
|
75 | Solve the conflict and go on: | |
76 |
|
76 | |||
@@ -123,7 +123,7 b' Rebase F onto E - check keepbranches:' | |||||
123 | warning: conflicts during merge. |
|
123 | warning: conflicts during merge. | |
124 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
124 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | |
125 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
125 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
126 |
[ |
|
126 | [1] | |
127 |
|
127 | |||
128 | Solve the conflict and go on: |
|
128 | Solve the conflict and go on: | |
129 |
|
129 |
@@ -66,7 +66,7 b' Conflicting rebase:' | |||||
66 | warning: conflicts during merge. |
|
66 | warning: conflicts during merge. | |
67 | merging common incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
67 | merging common incomplete! (edit conflicts, then use 'hg resolve --mark') | |
68 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
68 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
69 |
[ |
|
69 | [1] | |
70 |
|
70 | |||
71 | Try to continue without solving the conflict: |
|
71 | Try to continue without solving the conflict: | |
72 |
|
72 |
@@ -373,7 +373,7 b' Ensure --continue restores a correct sta' | |||||
373 | warning: conflicts during merge. |
|
373 | warning: conflicts during merge. | |
374 | merging H incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
374 | merging H incomplete! (edit conflicts, then use 'hg resolve --mark') | |
375 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
375 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
376 |
[ |
|
376 | [1] | |
377 | $ hg resolve --all -t internal:local |
|
377 | $ hg resolve --all -t internal:local | |
378 | $ hg rebase -c |
|
378 | $ hg rebase -c | |
379 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob) |
|
379 | saved backup bundle to $TESTTMP/a7/.hg/strip-backup/6215fafa5447-backup.hg (glob) |
@@ -62,7 +62,7 b' Rebasing B onto E:' | |||||
62 | warning: conflicts during merge. |
|
62 | warning: conflicts during merge. | |
63 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
63 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | |
64 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
64 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
65 |
[ |
|
65 | [1] | |
66 |
|
66 | |||
67 | Force a commit on C during the interruption: |
|
67 | Force a commit on C during the interruption: | |
68 |
|
68 | |||
@@ -98,7 +98,7 b' Resume the rebasing:' | |||||
98 | warning: conflicts during merge. |
|
98 | warning: conflicts during merge. | |
99 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
99 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | |
100 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
100 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
101 |
[ |
|
101 | [1] | |
102 |
|
102 | |||
103 | Solve the conflict and go on: |
|
103 | Solve the conflict and go on: | |
104 |
|
104 | |||
@@ -152,7 +152,7 b' Rebasing B onto E:' | |||||
152 | warning: conflicts during merge. |
|
152 | warning: conflicts during merge. | |
153 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
153 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | |
154 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
154 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
155 |
[ |
|
155 | [1] | |
156 |
|
156 | |||
157 | Force a commit on B' during the interruption: |
|
157 | Force a commit on B' during the interruption: | |
158 |
|
158 | |||
@@ -223,7 +223,7 b' Rebasing B onto E:' | |||||
223 | warning: conflicts during merge. |
|
223 | warning: conflicts during merge. | |
224 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') |
|
224 | merging A incomplete! (edit conflicts, then use 'hg resolve --mark') | |
225 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
225 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
226 |
[ |
|
226 | [1] | |
227 |
|
227 | |||
228 | Change phase on B and B' |
|
228 | Change phase on B and B' | |
229 |
|
229 |
@@ -109,7 +109,7 b' already has one local mq patch' | |||||
109 |
|
109 | |||
110 | $ HGMERGE=internal:fail hg rebase |
|
110 | $ HGMERGE=internal:fail hg rebase | |
111 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
111 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
112 |
[ |
|
112 | [1] | |
113 |
|
113 | |||
114 | $ HGMERGE=internal:local hg resolve --all |
|
114 | $ HGMERGE=internal:local hg resolve --all | |
115 |
|
115 |
@@ -64,7 +64,7 b' Rebase - generate a conflict:' | |||||
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 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
66 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
67 |
[ |
|
67 | [1] | |
68 |
|
68 | |||
69 | Fix the 1st conflict: |
|
69 | Fix the 1st conflict: | |
70 |
|
70 | |||
@@ -75,7 +75,7 b' Fix the 1st conflict:' | |||||
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 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
77 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
78 |
[ |
|
78 | [1] | |
79 |
|
79 | |||
80 | Fix the 2nd conflict: |
|
80 | Fix the 2nd conflict: | |
81 |
|
81 |
@@ -417,7 +417,7 b' Test --tool parameter:' | |||||
417 |
|
417 | |||
418 | $ hg rebase -s 2 -d 1 --tool internal:fail |
|
418 | $ hg rebase -s 2 -d 1 --tool internal:fail | |
419 | unresolved conflicts (see hg resolve, then hg rebase --continue) |
|
419 | unresolved conflicts (see hg resolve, then hg rebase --continue) | |
420 |
[ |
|
420 | [1] | |
421 |
|
421 | |||
422 | $ hg resolve -l |
|
422 | $ hg resolve -l | |
423 | U c2 |
|
423 | U c2 |
General Comments 0
You need to be logged in to leave comments.
Login now