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