151 |
151 |
152 fix up |
152 fix up |
153 $ echo 'I can haz no commute' > e |
153 $ echo 'I can haz no commute' > e |
154 $ hg resolve --mark e |
154 $ hg resolve --mark e |
155 (no more unresolved files) |
155 (no more unresolved files) |
|
156 continue: hg histedit --continue |
156 $ hg histedit --continue 2>&1 | fixbundle |
157 $ hg histedit --continue 2>&1 | fixbundle |
157 merging e |
158 merging e |
158 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
159 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
159 Fix up the change and run hg histedit --continue |
160 Fix up the change and run hg histedit --continue |
160 |
161 |
163 |
164 |
164 just continue this time |
165 just continue this time |
165 $ hg revert -r 'p1()' e |
166 $ hg revert -r 'p1()' e |
166 $ hg resolve --mark e |
167 $ hg resolve --mark e |
167 (no more unresolved files) |
168 (no more unresolved files) |
|
169 continue: hg histedit --continue |
168 $ hg histedit --continue 2>&1 | fixbundle |
170 $ hg histedit --continue 2>&1 | fixbundle |
169 7b4e2f4b7bcd: empty changeset |
171 7b4e2f4b7bcd: empty changeset |
170 |
172 |
171 log after edit |
173 log after edit |
172 $ hg log --graph |
174 $ hg log --graph |
234 Fix up the change and run hg histedit --continue |
236 Fix up the change and run hg histedit --continue |
235 |
237 |
236 $ echo 'I can haz no commute' > e |
238 $ echo 'I can haz no commute' > e |
237 $ hg resolve --mark e |
239 $ hg resolve --mark e |
238 (no more unresolved files) |
240 (no more unresolved files) |
|
241 continue: hg histedit --continue |
239 $ hg histedit --continue 2>&1 | fixbundle |
242 $ hg histedit --continue 2>&1 | fixbundle |
240 merging e |
243 merging e |
241 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
244 warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
242 Fix up the change and run hg histedit --continue |
245 Fix up the change and run hg histedit --continue |
243 second edit also fails, but just continue |
246 second edit also fails, but just continue |
244 $ hg revert -r 'p1()' e |
247 $ hg revert -r 'p1()' e |
245 $ hg resolve --mark e |
248 $ hg resolve --mark e |
246 (no more unresolved files) |
249 (no more unresolved files) |
|
250 continue: hg histedit --continue |
247 $ hg histedit --continue 2>&1 | fixbundle |
251 $ hg histedit --continue 2>&1 | fixbundle |
248 7b4e2f4b7bcd: empty changeset |
252 7b4e2f4b7bcd: empty changeset |
249 |
253 |
250 post message fix |
254 post message fix |
251 $ hg log --graph |
255 $ hg log --graph |