Show More
@@ -409,7 +409,7 b' class histeditaction(object):' | |||
|
409 | 409 | parentctx, but does not commit them.""" |
|
410 | 410 | repo = self.repo |
|
411 | 411 | rulectx = repo[self.node] |
|
412 | hg.update(repo, self.state.parentctxnode) | |
|
412 | hg.update(repo, self.state.parentctxnode, quietempty=True) | |
|
413 | 413 | stats = applychanges(repo.ui, repo, rulectx, {}) |
|
414 | 414 | if stats and stats[3] > 0: |
|
415 | 415 | raise error.InterventionRequired(_('Fix up the change and run ' |
@@ -55,9 +55,6 b' Rebase B onto H' | |||
|
55 | 55 | > pick 32af7686d403 D |
|
56 | 56 | > EOF |
|
57 | 57 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
58 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
59 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
60 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
61 | 58 | |
|
62 | 59 | $ hg tglog |
|
63 | 60 | @ 7:0937e82309df47d14176ee15e45dbec5fbdef340:draft 'D' |
@@ -84,8 +81,6 b' Rebase back and drop something' | |||
|
84 | 81 | > pick 0937e82309df D |
|
85 | 82 | > EOF |
|
86 | 83 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
87 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
88 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
89 | 84 | |
|
90 | 85 | $ hg tglog |
|
91 | 86 | @ 6:476cc3e4168da2d036b141f7f7dcff7f8e3fe846:draft 'D' |
@@ -110,7 +105,6 b' Split stack' | |||
|
110 | 105 | > pick 476cc3e4168d D |
|
111 | 106 | > EOF |
|
112 | 107 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
113 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
114 | 108 | |
|
115 | 109 | $ hg tglog |
|
116 | 110 | @ 6:d7a6f907a822c4ce6f15662ae45a42aa46d3818a:draft 'D' |
@@ -153,7 +147,6 b' Abort' | |||
|
153 | 147 | > drop d7a6f907a822 D |
|
154 | 148 | > pick 591369deedfd X |
|
155 | 149 | > EOF |
|
156 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
157 | 150 | merging B |
|
158 | 151 | warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
|
159 | 152 | Fix up the change and run hg histedit --continue |
@@ -182,7 +175,6 b' Continue' | |||
|
182 | 175 | > drop d7a6f907a822 D |
|
183 | 176 | > pick 591369deedfd X |
|
184 | 177 | > EOF |
|
185 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
186 | 178 | merging B |
|
187 | 179 | warning: conflicts while merging B! (edit, then use 'hg resolve --mark') |
|
188 | 180 | Fix up the change and run hg histedit --continue |
@@ -86,8 +86,6 b' edit the history' | |||
|
86 | 86 | $ HGEDITOR="cat \"$EDITED\" > " hg histedit 177f92b77385 2>&1 | fixbundle |
|
87 | 87 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
88 | 88 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
89 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
90 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
91 | 89 | |
|
92 | 90 | rules should end up in .hg/histedit-last-edit.txt: |
|
93 | 91 | $ cat .hg/histedit-last-edit.txt |
@@ -140,8 +138,6 b' put things back' | |||
|
140 | 138 | > EOF |
|
141 | 139 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
142 | 140 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
143 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
144 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
145 | 141 | |
|
146 | 142 | $ hg log --graph |
|
147 | 143 | @ changeset: 5:7eca9b5b1148 |
@@ -186,9 +182,6 b' slightly different this time' | |||
|
186 | 182 | > EOF |
|
187 | 183 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
188 | 184 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
189 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
190 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
191 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
192 | 185 | $ hg log --graph |
|
193 | 186 | @ changeset: 5:38b92f448761 |
|
194 | 187 | | tag: tip |
@@ -231,7 +224,6 b' keep prevents stripping dead revs' | |||
|
231 | 224 | > EOF |
|
232 | 225 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
233 | 226 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
234 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
235 | 227 | $ hg log --graph |
|
236 | 228 | @ changeset: 7:803ef1c6fcfd |
|
237 | 229 | | tag: tip |
@@ -422,7 +414,6 b" Now, let's try to fold the second commit" | |||
|
422 | 414 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
423 | 415 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
424 | 416 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
425 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
426 | 417 | saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob) |
|
427 | 418 | saved backup bundle to $TESTTMP/issue4251/.hg/strip-backup/*-backup.hg (glob) |
|
428 | 419 |
@@ -61,8 +61,6 b' edit the history' | |||
|
61 | 61 | > EOF |
|
62 | 62 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
63 | 63 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
64 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
65 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
66 | 64 | |
|
67 | 65 | log after edit |
|
68 | 66 | $ hg log --graph |
@@ -142,7 +142,6 b" qnew should fail while we're in the midd" | |||
|
142 | 142 | [255] |
|
143 | 143 | $ HGEDITOR='echo foobaz > ' hg histedit --continue 2>&1 | fixbundle |
|
144 | 144 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
145 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
146 | 145 | |
|
147 | 146 | $ hg log --graph |
|
148 | 147 | @ changeset: 6:b5f70786f9b0 |
@@ -120,7 +120,6 b' fix up' | |||
|
120 | 120 | |
|
121 | 121 | |
|
122 | 122 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
123 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
124 | 123 | merging e |
|
125 | 124 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
|
126 | 125 | Fix up the change and run hg histedit --continue |
@@ -132,7 +131,6 b' just continue this time' | |||
|
132 | 131 | $ hg histedit --continue 2>&1 | fixbundle |
|
133 | 132 | 7b4e2f4b7bcd: empty changeset |
|
134 | 133 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
135 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
136 | 134 | |
|
137 | 135 | log after edit |
|
138 | 136 | $ hg log --graph |
@@ -261,7 +259,6 b' fix up' | |||
|
261 | 259 | $ hg histedit --continue 2>&1 | fixbundle | grep -v '2 files removed' |
|
262 | 260 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
263 | 261 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
264 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
265 | 262 | merging e |
|
266 | 263 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
|
267 | 264 | Fix up the change and run hg histedit --continue |
@@ -273,7 +270,6 b' just continue this time' | |||
|
273 | 270 | $ hg histedit --continue 2>&1 | fixbundle |
|
274 | 271 | 7b4e2f4b7bcd: empty changeset |
|
275 | 272 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
276 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
277 | 273 | |
|
278 | 274 | log after edit |
|
279 | 275 | $ hg log --graph |
@@ -55,12 +55,9 b' log before edit' | |||
|
55 | 55 | > pick 055a42cdd887 d |
|
56 | 56 | > EOF |
|
57 | 57 | 0 files updated, 0 files merged, 4 files removed, 0 files unresolved |
|
58 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
59 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
60 | 58 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
61 | 59 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
62 | 60 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
63 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
64 | 61 | |
|
65 | 62 | log after edit |
|
66 | 63 | $ hg logt --graph |
@@ -119,8 +116,6 b' rollup will fold without preserving the ' | |||
|
119 | 116 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
120 | 117 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
121 | 118 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
122 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
123 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
124 | 119 | |
|
125 | 120 | $ HGEDITOR=$OLDHGEDITOR |
|
126 | 121 | |
@@ -493,11 +488,9 b' into the hook command.' | |||
|
493 | 488 | > pick 6c795aa153cb a |
|
494 | 489 | > EOF |
|
495 | 490 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
496 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
497 | 491 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
498 | 492 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
499 | 493 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
500 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
501 | 494 | commit 9599899f62c05f4377548c32bf1c9f1a39634b0c |
|
502 | 495 | |
|
503 | 496 | $ hg logt |
@@ -540,7 +533,6 b' editors.' | |||
|
540 | 533 | reverting foo |
|
541 | 534 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
542 | 535 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
543 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
544 | 536 | merging foo |
|
545 | 537 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
546 | 538 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
@@ -96,7 +96,6 b' editing a changeset without any actual c' | |||
|
96 | 96 | $ continueediting true "(leaving commit message unaltered)" |
|
97 | 97 | % finalize changeset editing (leaving commit message unaltered) |
|
98 | 98 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
99 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
100 | 99 | |
|
101 | 100 | |
|
102 | 101 | check state of working copy |
@@ -70,7 +70,6 b' edit the history' | |||
|
70 | 70 | > pick 652413bf663e f |
|
71 | 71 | > EOF |
|
72 | 72 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
73 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
74 | 73 | merging e |
|
75 | 74 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
|
76 | 75 | Fix up the change and run hg histedit --continue |
@@ -154,7 +154,6 b' fix up' | |||
|
154 | 154 | $ hg resolve --mark e |
|
155 | 155 | (no more unresolved files) |
|
156 | 156 | $ hg histedit --continue 2>&1 | fixbundle |
|
157 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
158 | 157 | merging e |
|
159 | 158 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
|
160 | 159 | Fix up the change and run hg histedit --continue |
@@ -169,7 +168,6 b' just continue this time' | |||
|
169 | 168 | $ hg histedit --continue 2>&1 | fixbundle |
|
170 | 169 | 7b4e2f4b7bcd: empty changeset |
|
171 | 170 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
172 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
173 | 171 | |
|
174 | 172 | log after edit |
|
175 | 173 | $ hg log --graph |
@@ -240,7 +238,6 b' edit the history, this time with a fold ' | |||
|
240 | 238 | $ hg resolve --mark e |
|
241 | 239 | (no more unresolved files) |
|
242 | 240 | $ hg histedit --continue 2>&1 | fixbundle |
|
243 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
244 | 241 | merging e |
|
245 | 242 | warning: conflicts while merging e! (edit, then use 'hg resolve --mark') |
|
246 | 243 | Fix up the change and run hg histedit --continue |
@@ -251,7 +248,6 b' second edit also fails, but just continu' | |||
|
251 | 248 | $ hg histedit --continue 2>&1 | fixbundle |
|
252 | 249 | 7b4e2f4b7bcd: empty changeset |
|
253 | 250 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
254 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
255 | 251 | |
|
256 | 252 | post message fix |
|
257 | 253 | $ hg log --graph |
@@ -200,7 +200,6 b' With rewritten ancestors' | |||
|
200 | 200 | > EOF |
|
201 | 201 | 0 files updated, 0 files merged, 3 files removed, 0 files unresolved |
|
202 | 202 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
203 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
204 | 203 | $ hg log -G |
|
205 | 204 | @ 17:ee6544123ab8 c |
|
206 | 205 | | |
@@ -292,11 +291,6 b' New-commit as draft (default)' | |||
|
292 | 291 | $ echo f >> f |
|
293 | 292 | $ hg histedit --continue |
|
294 | 293 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
295 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
296 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
297 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
298 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
299 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
300 | 294 | $ hg log -G |
|
301 | 295 | @ 24:12925f763c90 (secret) k |
|
302 | 296 | | |
@@ -341,11 +335,6 b' New-commit as draft (default)' | |||
|
341 | 335 | $ echo f >> f |
|
342 | 336 | $ hg histedit --continue |
|
343 | 337 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
344 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
345 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
346 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
347 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
348 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
349 | 338 | $ hg log -G |
|
350 | 339 | @ 24:12925f763c90 (secret) k |
|
351 | 340 | | |
@@ -384,10 +373,6 b' It seems more important to present the s' | |||
|
384 | 373 | > EOF |
|
385 | 374 | 0 files updated, 0 files merged, 5 files removed, 0 files unresolved |
|
386 | 375 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
387 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
388 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
389 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
390 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
391 | 376 | $ hg log -G |
|
392 | 377 | @ 23:9e712162b2c1 (secret) k |
|
393 | 378 | | |
@@ -430,15 +415,10 b' Note that there is a few reordering in t' | |||
|
430 | 415 | > fold 14bda137d5b3 16 k |
|
431 | 416 | > EOF |
|
432 | 417 | 0 files updated, 0 files merged, 6 files removed, 0 files unresolved |
|
433 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
434 | 418 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
435 | 419 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
436 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
437 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
438 | 420 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
439 | 421 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
440 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
441 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
442 | 422 | 0 files updated, 0 files merged, 2 files removed, 0 files unresolved |
|
443 | 423 | 2 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
444 | 424 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
General Comments 0
You need to be logged in to leave comments.
Login now