87 |
87 |
88 |
88 |
89 edit the history |
89 edit the history |
90 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 3 2>&1 | fixbundle |
90 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 3 2>&1 | fixbundle |
91 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
91 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
92 patching file e |
92 merging e |
93 Hunk #1 FAILED at 0 |
93 warning: conflicts during merge. |
94 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
94 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
95 abort: Fix up the change and run hg histedit --continue |
95 abort: Fix up the change and run hg histedit --continue |
96 |
96 |
97 abort the edit |
97 abort the edit |
98 $ hg histedit --abort 2>&1 | fixbundle |
98 $ hg histedit --abort 2>&1 | fixbundle |
99 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
99 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
145 |
145 |
146 |
146 |
147 edit the history |
147 edit the history |
148 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 3 2>&1 | fixbundle |
148 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 3 2>&1 | fixbundle |
149 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
149 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
150 patching file e |
150 merging e |
151 Hunk #1 FAILED at 0 |
151 warning: conflicts during merge. |
152 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
152 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
153 abort: Fix up the change and run hg histedit --continue |
153 abort: Fix up the change and run hg histedit --continue |
154 |
154 |
155 fix up |
155 fix up |
156 $ echo 'I can haz no commute' > e |
156 $ echo 'I can haz no commute' > e |
|
157 $ hg resolve --mark e |
157 $ hg histedit --continue 2>&1 | fixbundle |
158 $ hg histedit --continue 2>&1 | fixbundle |
158 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 |
159 patching file e |
160 merging e |
160 Hunk #1 FAILED at 0 |
161 warning: conflicts during merge. |
161 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
162 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
162 abort: Fix up the change and run hg histedit --continue |
163 abort: Fix up the change and run hg histedit --continue |
163 |
164 |
164 just continue this time |
165 just continue this time |
|
166 $ hg revert -r 'p1()' e |
|
167 $ hg resolve --mark e |
165 $ hg histedit --continue 2>&1 | fixbundle |
168 $ hg histedit --continue 2>&1 | fixbundle |
166 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
169 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
167 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
170 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
168 |
171 |
169 log after edit |
172 log after edit |
225 pick 500cac37a696 6 f |
228 pick 500cac37a696 6 f |
226 |
229 |
227 edit the history, this time with a fold action |
230 edit the history, this time with a fold action |
228 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 3 2>&1 | fixbundle |
231 $ HGEDITOR="cat \"$EDITED\" > " hg histedit 3 2>&1 | fixbundle |
229 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
232 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
230 patching file e |
233 merging e |
231 Hunk #1 FAILED at 0 |
234 warning: conflicts during merge. |
232 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
235 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
233 abort: Fix up the change and run hg histedit --continue |
236 abort: Fix up the change and run hg histedit --continue |
234 |
237 |
235 $ echo 'I can haz no commute' > e |
238 $ echo 'I can haz no commute' > e |
|
239 $ hg resolve --mark e |
236 $ HGEDITOR="cat \"$EDITED\" > " hg histedit --continue 2>&1 | fixbundle |
240 $ HGEDITOR="cat \"$EDITED\" > " hg histedit --continue 2>&1 | fixbundle |
237 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
241 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
238 patching file e |
242 merging e |
239 Hunk #1 FAILED at 0 |
243 warning: conflicts during merge. |
240 1 out of 1 hunks FAILED -- saving rejects to file e.rej |
244 merging e incomplete! (edit conflicts, then use 'hg resolve --mark') |
241 abort: Fix up the change and run hg histedit --continue |
245 abort: Fix up the change and run hg histedit --continue |
242 second edit also fails, but just continue |
246 second edit also fails, but just continue |
|
247 $ hg revert -r 'p1()' e |
|
248 $ hg resolve --mark e |
243 $ hg histedit --continue 2>&1 | fixbundle |
249 $ hg histedit --continue 2>&1 | fixbundle |
244 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
250 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
245 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
251 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
246 |
252 |
247 post message fix |
253 post message fix |