152 Fix up the change and run hg histedit --continue |
152 Fix up the change and run hg histedit --continue |
153 |
153 |
154 fix up |
154 fix up |
155 $ echo 'I can haz no commute' > e |
155 $ echo 'I can haz no commute' > e |
156 $ hg resolve --mark e |
156 $ hg resolve --mark e |
157 no unresolved files; you may continue your unfinished operation |
157 no more unresolved files |
158 $ hg histedit --continue 2>&1 | fixbundle |
158 $ hg histedit --continue 2>&1 | fixbundle |
159 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
159 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
160 merging e |
160 merging e |
161 warning: conflicts during merge. |
161 warning: conflicts during merge. |
162 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
162 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
166 former children. |
166 former children. |
167 |
167 |
168 just continue this time |
168 just continue this time |
169 $ hg revert -r 'p1()' e |
169 $ hg revert -r 'p1()' e |
170 $ hg resolve --mark e |
170 $ hg resolve --mark e |
171 no unresolved files; you may continue your unfinished operation |
171 no more unresolved files |
172 $ hg histedit --continue 2>&1 | fixbundle |
172 $ hg histedit --continue 2>&1 | fixbundle |
173 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
173 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
174 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
174 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
175 |
175 |
176 log after edit |
176 log after edit |
239 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
239 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
240 Fix up the change and run hg histedit --continue |
240 Fix up the change and run hg histedit --continue |
241 |
241 |
242 $ echo 'I can haz no commute' > e |
242 $ echo 'I can haz no commute' > e |
243 $ hg resolve --mark e |
243 $ hg resolve --mark e |
244 no unresolved files; you may continue your unfinished operation |
244 no more unresolved files |
245 $ hg histedit --continue 2>&1 | fixbundle |
245 $ hg histedit --continue 2>&1 | fixbundle |
246 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
246 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
247 merging e |
247 merging e |
248 warning: conflicts during merge. |
248 warning: conflicts during merge. |
249 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
249 merging e 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 second edit also fails, but just continue |
251 second edit also fails, but just continue |
252 $ hg revert -r 'p1()' e |
252 $ hg revert -r 'p1()' e |
253 $ hg resolve --mark e |
253 $ hg resolve --mark e |
254 no unresolved files; you may continue your unfinished operation |
254 no more unresolved files |
255 $ hg histedit --continue 2>&1 | fixbundle |
255 $ hg histedit --continue 2>&1 | fixbundle |
256 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
256 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
257 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
257 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
258 |
258 |
259 post message fix |
259 post message fix |