84 > pick 055a42cdd887 d |
84 > pick 055a42cdd887 d |
85 > EOF |
85 > EOF |
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 |
94 pick 177f92b77385 c |
92 pick 177f92b77385 c |
95 pick e860deea161a e |
93 pick e860deea161a e |
138 > pick d8249471110a e |
136 > pick d8249471110a e |
139 > pick 8ade9693061e f |
137 > pick 8ade9693061e f |
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 |
148 | tag: tip |
144 | tag: tip |
149 | user: test |
145 | user: test |
183 > pick 7eca9b5b1148 f |
179 > pick 7eca9b5b1148 f |
184 > pick 915da888f2de e |
180 > pick 915da888f2de e |
185 > pick 177f92b77385 c |
181 > pick 177f92b77385 c |
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 |
|
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 |
184 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 |
195 | user: test |
188 | user: test |
228 > pick be9ae3a309c6 f |
221 > pick be9ae3a309c6 f |
229 > pick 38b92f448761 c |
222 > pick 38b92f448761 c |
230 > pick de71b079d9ce e |
223 > pick de71b079d9ce e |
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 |
|
234 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 |
235 $ hg log --graph |
227 $ hg log --graph |
236 @ changeset: 7:803ef1c6fcfd |
228 @ changeset: 7:803ef1c6fcfd |
237 | tag: tip |
229 | tag: tip |
238 | user: test |
230 | user: test |
420 adding another-dir/initial-file (glob) |
412 adding another-dir/initial-file (glob) |
421 removing initial-dir/initial-file (glob) |
413 removing initial-dir/initial-file (glob) |
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 |
429 $ hg --config diff.git=yes export 0 |
420 $ hg --config diff.git=yes export 0 |
430 # HG changeset patch |
421 # HG changeset patch |