Show More
@@ -447,13 +447,18 b' class histeditaction(object):' | |||||
447 | parentctx, but does not commit them.""" |
|
447 | parentctx, but does not commit them.""" | |
448 | repo = self.repo |
|
448 | repo = self.repo | |
449 | rulectx = repo[self.node] |
|
449 | rulectx = repo[self.node] | |
|
450 | repo.ui.pushbuffer(error=True, labeled=True) | |||
450 | hg.update(repo, self.state.parentctxnode, quietempty=True) |
|
451 | hg.update(repo, self.state.parentctxnode, quietempty=True) | |
451 | stats = applychanges(repo.ui, repo, rulectx, {}) |
|
452 | stats = applychanges(repo.ui, repo, rulectx, {}) | |
452 | if stats and stats[3] > 0: |
|
453 | if stats and stats[3] > 0: | |
|
454 | buf = repo.ui.popbuffer() | |||
|
455 | repo.ui.write(*buf) | |||
453 | raise error.InterventionRequired( |
|
456 | raise error.InterventionRequired( | |
454 | _('Fix up the change (%s %s)') % |
|
457 | _('Fix up the change (%s %s)') % | |
455 | (self.verb, node.short(self.node)), |
|
458 | (self.verb, node.short(self.node)), | |
456 | hint=_('hg histedit --continue to resume')) |
|
459 | hint=_('hg histedit --continue to resume')) | |
|
460 | else: | |||
|
461 | repo.ui.popbuffer() | |||
457 |
|
462 | |||
458 | def continuedirty(self): |
|
463 | def continuedirty(self): | |
459 | """Continues the action when changes have been applied to the working |
|
464 | """Continues the action when changes have been applied to the working | |
@@ -733,7 +738,9 b' class fold(histeditaction):' | |||||
733 |
|
738 | |||
734 | def finishfold(self, ui, repo, ctx, oldctx, newnode, internalchanges): |
|
739 | def finishfold(self, ui, repo, ctx, oldctx, newnode, internalchanges): | |
735 | parent = ctx.parents()[0].node() |
|
740 | parent = ctx.parents()[0].node() | |
|
741 | repo.ui.pushbuffer() | |||
736 | hg.update(repo, parent) |
|
742 | hg.update(repo, parent) | |
|
743 | repo.ui.popbuffer() | |||
737 | ### prepare new commit data |
|
744 | ### prepare new commit data | |
738 | commitopts = {} |
|
745 | commitopts = {} | |
739 | commitopts['user'] = ctx.user() |
|
746 | commitopts['user'] = ctx.user() | |
@@ -764,7 +771,9 b' class fold(histeditaction):' | |||||
764 | repo.ui.restoreconfig(phasebackup) |
|
771 | repo.ui.restoreconfig(phasebackup) | |
765 | if n is None: |
|
772 | if n is None: | |
766 | return ctx, [] |
|
773 | return ctx, [] | |
|
774 | repo.ui.pushbuffer() | |||
767 | hg.update(repo, n) |
|
775 | hg.update(repo, n) | |
|
776 | repo.ui.popbuffer() | |||
768 | replacements = [(oldctx.node(), (newnode,)), |
|
777 | replacements = [(oldctx.node(), (newnode,)), | |
769 | (ctx.node(), (n,)), |
|
778 | (ctx.node(), (n,)), | |
770 | (newnode, (n,)), |
|
779 | (newnode, (n,)), | |
@@ -1167,7 +1176,9 b' def _histedit(ui, repo, state, *freeargs' | |||||
1167 | state.write() |
|
1176 | state.write() | |
1168 | ui.progress(_("editing"), None) |
|
1177 | ui.progress(_("editing"), None) | |
1169 |
|
1178 | |||
|
1179 | repo.ui.pushbuffer() | |||
1170 | hg.update(repo, state.parentctxnode, quietempty=True) |
|
1180 | hg.update(repo, state.parentctxnode, quietempty=True) | |
|
1181 | repo.ui.popbuffer() | |||
1171 |
|
1182 | |||
1172 | mapping, tmpnodes, created, ntm = processreplacement(state) |
|
1183 | mapping, tmpnodes, created, ntm = processreplacement(state) | |
1173 | if mapping: |
|
1184 | if mapping: |
@@ -243,9 +243,6 b' short hash. This tests issue3893.' | |||||
243 | > p c8e68270e35a 3 four |
|
243 | > p c8e68270e35a 3 four | |
244 | > f 08d98a8350f3 4 five |
|
244 | > f 08d98a8350f3 4 five | |
245 | > EOF |
|
245 | > EOF | |
246 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
247 | reverting alpha |
|
|||
248 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
249 | four |
|
246 | four | |
250 | *** |
|
247 | *** | |
251 | five |
|
248 | five | |
@@ -258,7 +255,6 b' short hash. This tests issue3893.' | |||||
258 | HG: user: test |
|
255 | HG: user: test | |
259 | HG: branch 'default' |
|
256 | HG: branch 'default' | |
260 | HG: changed alpha |
|
257 | HG: changed alpha | |
261 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
262 | saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob) |
|
258 | saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob) | |
263 | saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob) |
|
259 | saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob) | |
264 |
|
260 |
@@ -104,7 +104,6 b' rules should end up in .hg/histedit-last' | |||||
104 | > pick 055a42cdd887 d |
|
104 | > pick 055a42cdd887 d | |
105 | > EOF |
|
105 | > EOF | |
106 | $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle |
|
106 | $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle | |
107 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
|||
108 |
|
107 | |||
109 | log after edit |
|
108 | log after edit | |
110 | $ hg log --graph |
|
109 | $ hg log --graph | |
@@ -148,7 +147,6 b' put things back' | |||||
148 | > pick d8249471110a e |
|
147 | > pick d8249471110a e | |
149 | > pick 8ade9693061e f |
|
148 | > pick 8ade9693061e f | |
150 | > EOF |
|
149 | > EOF | |
151 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
|||
152 |
|
150 | |||
153 | $ hg log --graph |
|
151 | $ hg log --graph | |
154 | @ changeset: 5:7eca9b5b1148 |
|
152 | @ changeset: 5:7eca9b5b1148 | |
@@ -191,7 +189,6 b' slightly different this time' | |||||
191 | > pick 915da888f2de e |
|
189 | > pick 915da888f2de e | |
192 | > pick 177f92b77385 c |
|
190 | > pick 177f92b77385 c | |
193 | > EOF |
|
191 | > EOF | |
194 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
|||
195 | $ hg log --graph |
|
192 | $ hg log --graph | |
196 | @ changeset: 5:38b92f448761 |
|
193 | @ changeset: 5:38b92f448761 | |
197 | | tag: tip |
|
194 | | tag: tip | |
@@ -232,7 +229,6 b' keep prevents stripping dead revs' | |||||
232 | > pick 38b92f448761 c |
|
229 | > pick 38b92f448761 c | |
233 | > pick de71b079d9ce e |
|
230 | > pick de71b079d9ce e | |
234 | > EOF |
|
231 | > EOF | |
235 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
|||
236 | $ hg log --graph |
|
232 | $ hg log --graph | |
237 | @ changeset: 7:803ef1c6fcfd |
|
233 | @ changeset: 7:803ef1c6fcfd | |
238 | | tag: tip |
|
234 | | tag: tip | |
@@ -417,11 +413,6 b" Now, let's try to fold the second commit" | |||||
417 | > EOF |
|
413 | > EOF | |
418 |
|
414 | |||
419 | $ HGEDITOR="sh ./editor.sh" hg histedit 0 |
|
415 | $ HGEDITOR="sh ./editor.sh" hg histedit 0 | |
420 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|||
421 | adding another-dir/initial-file (glob) |
|
|||
422 | removing initial-dir/initial-file (glob) |
|
|||
423 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|||
424 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
425 | saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob) |
|
416 | saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob) | |
426 | saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob) |
|
417 | saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob) | |
427 |
|
418 |
@@ -59,7 +59,6 b' edit the history' | |||||
59 | > pick 652413bf663e f |
|
59 | > pick 652413bf663e f | |
60 | > pick 055a42cdd887 d |
|
60 | > pick 055a42cdd887 d | |
61 | > EOF |
|
61 | > EOF | |
62 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
|||
63 |
|
62 | |||
64 | log after edit |
|
63 | log after edit | |
65 | $ hg log --graph |
|
64 | $ hg log --graph | |
@@ -124,7 +123,6 b' Drop the last changeset' | |||||
124 | > pick a4f7421b80f7 f |
|
123 | > pick a4f7421b80f7 f | |
125 | > drop f518305ce889 d |
|
124 | > drop f518305ce889 d | |
126 | > EOF |
|
125 | > EOF | |
127 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|||
128 | $ hg log --graph |
|
126 | $ hg log --graph | |
129 | @ changeset: 3:a4f7421b80f7 |
|
127 | @ changeset: 3:a4f7421b80f7 | |
130 | | tag: tip |
|
128 | | tag: tip | |
@@ -158,7 +156,6 b' Drop the last changeset' | |||||
158 | > pick cb9a9f314b8b a |
|
156 | > pick cb9a9f314b8b a | |
159 | > pick ee283cb5f2d5 e |
|
157 | > pick ee283cb5f2d5 e | |
160 | > EOF |
|
158 | > EOF | |
161 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
|||
162 | $ hg log --graph |
|
159 | $ hg log --graph | |
163 | @ changeset: 1:e99c679bf03e |
|
160 | @ changeset: 1:e99c679bf03e | |
164 | | tag: tip |
|
161 | | tag: tip |
@@ -286,7 +286,6 b" say we'll change the message, but don't." | |||||
286 | > mv tmp "\$1" |
|
286 | > mv tmp "\$1" | |
287 | > EOF |
|
287 | > EOF | |
288 | $ HGEDITOR="sh ../edit.sh" hg histedit tip 2>&1 | fixbundle |
|
288 | $ HGEDITOR="sh ../edit.sh" hg histedit tip 2>&1 | fixbundle | |
289 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|||
290 | $ hg status |
|
289 | $ hg status | |
291 | $ hg log --limit 1 |
|
290 | $ hg log --limit 1 | |
292 | changeset: 6:1fd3b2fe7754 |
|
291 | changeset: 6:1fd3b2fe7754 | |
@@ -327,7 +326,6 b' check saving last-message.txt, at first' | |||||
327 | $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit tip --commands - 2>&1 << EOF | fixbundle |
|
326 | $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit tip --commands - 2>&1 << EOF | fixbundle | |
328 | > mess 1fd3b2fe7754 f |
|
327 | > mess 1fd3b2fe7754 f | |
329 | > EOF |
|
328 | > EOF | |
330 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|||
331 | abort: emulating unexpected abort |
|
329 | abort: emulating unexpected abort | |
332 | $ test -f .hg/last-message.txt |
|
330 | $ test -f .hg/last-message.txt | |
333 | [1] |
|
331 | [1] | |
@@ -354,8 +352,6 b' check saving last-message.txt, at first' | |||||
354 | $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit tip --commands - 2>&1 << EOF |
|
352 | $ HGEDITOR="sh $TESTTMP/editor.sh" hg histedit tip --commands - 2>&1 << EOF | |
355 | > mess 1fd3b2fe7754 f |
|
353 | > mess 1fd3b2fe7754 f | |
356 | > EOF |
|
354 | > EOF | |
357 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|||
358 | adding f |
|
|||
359 | ==== before editing |
|
355 | ==== before editing | |
360 | f |
|
356 | f | |
361 |
|
357 | |||
@@ -408,7 +404,6 b' then, check "modify the message" itself' | |||||
408 | $ hg histedit tip --commands - 2>&1 << EOF | fixbundle |
|
404 | $ hg histedit tip --commands - 2>&1 << EOF | fixbundle | |
409 | > mess 1fd3b2fe7754 f |
|
405 | > mess 1fd3b2fe7754 f | |
410 | > EOF |
|
406 | > EOF | |
411 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|||
412 | $ hg status |
|
407 | $ hg status | |
413 | $ hg log --limit 1 |
|
408 | $ hg log --limit 1 | |
414 | changeset: 6:62feedb1200e |
|
409 | changeset: 6:62feedb1200e |
@@ -104,7 +104,6 b' fix up' | |||||
104 |
|
104 | |||
105 | > EOF |
|
105 | > EOF | |
106 | $ HGEDITOR="python cat.py" hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed' |
|
106 | $ HGEDITOR="python cat.py" hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed' | |
107 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
108 | d |
|
107 | d | |
109 | *** |
|
108 | *** | |
110 | does not commute with e |
|
109 | does not commute with e | |
@@ -121,7 +120,6 b' fix up' | |||||
121 |
|
120 | |||
122 |
|
121 | |||
123 |
|
122 | |||
124 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
125 | merging e |
|
123 | merging e | |
126 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
|
124 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | |
127 | Fix up the change (pick 7b4e2f4b7bcd) |
|
125 | Fix up the change (pick 7b4e2f4b7bcd) | |
@@ -262,8 +260,6 b' fix up' | |||||
262 | (no more unresolved files) |
|
260 | (no more unresolved files) | |
263 | continue: hg histedit --continue |
|
261 | continue: hg histedit --continue | |
264 | $ hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed' |
|
262 | $ hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed' | |
265 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
266 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
267 | merging e |
|
263 | merging e | |
268 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
|
264 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | |
269 | Fix up the change (pick 7b4e2f4b7bcd) |
|
265 | Fix up the change (pick 7b4e2f4b7bcd) |
@@ -54,9 +54,6 b' log before edit' | |||||
54 | > fold 177f92b77385 c |
|
54 | > fold 177f92b77385 c | |
55 | > pick 055a42cdd887 d |
|
55 | > pick 055a42cdd887 d | |
56 | > EOF |
|
56 | > EOF | |
57 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
|||
58 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
|||
59 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
60 |
|
57 | |||
61 | log after edit |
|
58 | log after edit | |
62 | $ hg logt --graph |
|
59 | $ hg logt --graph | |
@@ -111,9 +108,6 b' rollup will fold without preserving the ' | |||||
111 | > pick 6de59d13424a f |
|
108 | > pick 6de59d13424a f | |
112 | > pick 9c277da72c9b d |
|
109 | > pick 9c277da72c9b d | |
113 | > EOF |
|
110 | > EOF | |
114 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
|||
115 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
|||
116 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
117 |
|
111 | |||
118 | $ HGEDITOR=$OLDHGEDITOR |
|
112 | $ HGEDITOR=$OLDHGEDITOR | |
119 |
|
113 | |||
@@ -177,10 +171,7 b' check saving last-message.txt' | |||||
177 | > pick 8e03a72b6f83 f |
|
171 | > pick 8e03a72b6f83 f | |
178 | > fold c4a9eb7989fc d |
|
172 | > fold c4a9eb7989fc d | |
179 | > EOF |
|
173 | > EOF | |
180 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|||
181 | adding d |
|
|||
182 | allow non-folding commit |
|
174 | allow non-folding commit | |
183 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
|||
184 | ==== before editing |
|
175 | ==== before editing | |
185 | f |
|
176 | f | |
186 | *** |
|
177 | *** | |
@@ -242,9 +233,6 b' tip before edit' | |||||
242 | > EOF |
|
233 | > EOF | |
243 | editing: pick e860deea161a 4 e 1/2 changes (50.00%) |
|
234 | editing: pick e860deea161a 4 e 1/2 changes (50.00%) | |
244 | editing: fold a00ad806cb55 5 f 2/2 changes (100.00%) |
|
235 | editing: fold a00ad806cb55 5 f 2/2 changes (100.00%) | |
245 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|||
246 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
|||
247 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
248 |
|
236 | |||
249 | tip after edit |
|
237 | tip after edit | |
250 | $ hg log --rev . |
|
238 | $ hg log --rev . | |
@@ -372,7 +360,6 b' dropped revision.' | |||||
372 | created new head |
|
360 | created new head | |
373 | $ echo 6 >> file |
|
361 | $ echo 6 >> file | |
374 | $ HGEDITOR=cat hg histedit --continue |
|
362 | $ HGEDITOR=cat hg histedit --continue | |
375 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
376 | +4 |
|
363 | +4 | |
377 | *** |
|
364 | *** | |
378 | +5.2 |
|
365 | +5.2 | |
@@ -387,7 +374,6 b' dropped revision.' | |||||
387 | HG: user: test |
|
374 | HG: user: test | |
388 | HG: branch 'default' |
|
375 | HG: branch 'default' | |
389 | HG: changed file |
|
376 | HG: changed file | |
390 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
391 | saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/55c8d8dc79ce-4066cd98-backup.hg (glob) |
|
377 | saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/55c8d8dc79ce-4066cd98-backup.hg (glob) | |
392 | saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-a35700fc-backup.hg (glob) |
|
378 | saved backup bundle to $TESTTMP/fold-with-dropped/.hg/strip-backup/617f94f13c0f-a35700fc-backup.hg (glob) | |
393 | $ hg logt -G |
|
379 | $ hg logt -G | |
@@ -443,10 +429,6 b' Folding with initial rename (issue3729)' | |||||
443 | > pick 1c4f440a8085 rename |
|
429 | > pick 1c4f440a8085 rename | |
444 | > fold e0371e0426bc b |
|
430 | > fold e0371e0426bc b | |
445 | > EOF |
|
431 | > EOF | |
446 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
447 | reverting b.txt |
|
|||
448 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|||
449 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|||
450 |
|
432 | |||
451 | $ hg logt --follow b.txt |
|
433 | $ hg logt --follow b.txt | |
452 | 1:cf858d235c76 rename |
|
434 | 1:cf858d235c76 rename | |
@@ -489,9 +471,6 b' into the hook command.' | |||||
489 | > fold a1a953ffb4b0 c |
|
471 | > fold a1a953ffb4b0 c | |
490 | > pick 6c795aa153cb a |
|
472 | > pick 6c795aa153cb a | |
491 | > EOF |
|
473 | > EOF | |
492 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
|||
493 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
|||
494 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
495 | commit 9599899f62c05f4377548c32bf1c9f1a39634b0c |
|
474 | commit 9599899f62c05f4377548c32bf1c9f1a39634b0c | |
496 |
|
475 | |||
497 | $ hg logt |
|
476 | $ hg logt | |
@@ -530,13 +509,6 b' editors.' | |||||
530 | > fold b7389cc4d66e 3 foo2 |
|
509 | > fold b7389cc4d66e 3 foo2 | |
531 | > fold 21679ff7675c 4 foo3 |
|
510 | > fold 21679ff7675c 4 foo3 | |
532 | > EOF |
|
511 | > EOF | |
533 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
534 | reverting foo |
|
|||
535 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|||
536 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
537 | merging foo |
|
|||
538 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|||
539 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
540 | $ hg logt |
|
512 | $ hg logt | |
541 | 2:e8bedbda72c1 merged foos |
|
513 | 2:e8bedbda72c1 merged foos | |
542 | 1:578c7455730c a |
|
514 | 1:578c7455730c a |
@@ -69,7 +69,6 b' edit the history' | |||||
69 | > pick e860deea161a e |
|
69 | > pick e860deea161a e | |
70 | > pick 652413bf663e f |
|
70 | > pick 652413bf663e f | |
71 | > EOF |
|
71 | > EOF | |
72 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
|||
73 | merging e |
|
72 | merging e | |
74 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
|
73 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') | |
75 | Fix up the change (pick e860deea161a) |
|
74 | Fix up the change (pick e860deea161a) |
@@ -108,7 +108,6 b' create an hidden revision' | |||||
108 | > drop 59d9f330561f 7 d |
|
108 | > drop 59d9f330561f 7 d | |
109 | > pick cacdfd884a93 8 f |
|
109 | > pick cacdfd884a93 8 f | |
110 | > EOF |
|
110 | > EOF | |
111 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
|||
112 | $ hg log --graph |
|
111 | $ hg log --graph | |
113 | @ 11:c13eb81022ca f |
|
112 | @ 11:c13eb81022ca f | |
114 | | |
|
113 | | | |
@@ -167,7 +166,6 b' dropped changeset to be hidden.' | |||||
167 | > pick 40db8afa467b 10 c |
|
166 | > pick 40db8afa467b 10 c | |
168 | > drop b449568bf7fc 11 f |
|
167 | > drop b449568bf7fc 11 f | |
169 | > EOF |
|
168 | > EOF | |
170 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
|||
171 | $ hg log -G |
|
169 | $ hg log -G | |
172 | @ 12:40db8afa467b c |
|
170 | @ 12:40db8afa467b c | |
173 | | |
|
171 | | | |
@@ -187,7 +185,6 b' With rewritten ancestors' | |||||
187 | > pick 40db8afa467b 10 c |
|
185 | > pick 40db8afa467b 10 c | |
188 | > drop 1b3b05f35ff0 13 h |
|
186 | > drop 1b3b05f35ff0 13 h | |
189 | > EOF |
|
187 | > EOF | |
190 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
|||
191 | $ hg log -G |
|
188 | $ hg log -G | |
192 | @ 17:ee6544123ab8 c |
|
189 | @ 17:ee6544123ab8 c | |
193 | | |
|
190 | | | |
@@ -357,7 +354,6 b' It seems more important to present the s' | |||||
357 | > pick 7395e1ff83bd 13 h |
|
354 | > pick 7395e1ff83bd 13 h | |
358 | > pick ee118ab9fa44 16 k |
|
355 | > pick ee118ab9fa44 16 k | |
359 | > EOF |
|
356 | > EOF | |
360 | 0 files updated, 0 files merged, 5 files removed, 0 files unresolved |
|
|||
361 | $ hg log -G |
|
357 | $ hg log -G | |
362 | @ 23:558246857888 (secret) k |
|
358 | @ 23:558246857888 (secret) k | |
363 | | |
|
359 | | | |
@@ -399,13 +395,6 b' Note that there is a few reordering in t' | |||||
399 | > pick b605fb7503f2 14 i |
|
395 | > pick b605fb7503f2 14 i | |
400 | > fold ee118ab9fa44 16 k |
|
396 | > fold ee118ab9fa44 16 k | |
401 | > EOF |
|
397 | > EOF | |
402 | 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
|
|||
403 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
|||
404 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
405 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
|||
406 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
407 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
|||
408 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
|||
409 | $ hg log -G |
|
398 | $ hg log -G | |
410 | @ 27:f9daec13fb98 (secret) i |
|
399 | @ 27:f9daec13fb98 (secret) i | |
411 | | |
|
400 | | |
General Comments 0
You need to be logged in to leave comments.
Login now