equal
deleted
inserted
replaced
70 $ hg histedit -r 4 |
70 $ hg histedit -r 4 |
71 abort: 08d98a8350f3 is not an ancestor of working directory |
71 abort: 08d98a8350f3 is not an ancestor of working directory |
72 [255] |
72 [255] |
73 $ hg up --quiet |
73 $ hg up --quiet |
74 |
74 |
|
75 |
|
76 Test that we pick the minimum of a revrange |
|
77 --------------------------------------- |
|
78 |
|
79 $ HGEDITOR=cat hg histedit '2::' --commands - << EOF |
|
80 > pick eb57da33312f 2 three |
|
81 > pick c8e68270e35a 3 four |
|
82 > pick 08d98a8350f3 4 five |
|
83 > EOF |
|
84 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
85 $ hg up --quiet |
|
86 |
|
87 $ HGEDITOR=cat hg histedit 'tip:2' --commands - << EOF |
|
88 > pick eb57da33312f 2 three |
|
89 > pick c8e68270e35a 3 four |
|
90 > pick 08d98a8350f3 4 five |
|
91 > EOF |
|
92 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
93 $ hg up --quiet |
|
94 |
75 Run on a revision not descendants of the initial parent |
95 Run on a revision not descendants of the initial parent |
76 -------------------------------------------------------------------- |
96 -------------------------------------------------------------------- |
77 |
97 |
78 Test the message shown for inconsistent histedit state, which may be |
98 Test the message shown for inconsistent histedit state, which may be |
79 created (and forgotten) by Mercurial earlier than 2.7. This emulates |
99 created (and forgotten) by Mercurial earlier than 2.7. This emulates |
196 HG: branch 'default' |
216 HG: branch 'default' |
197 HG: changed alpha |
217 HG: changed alpha |
198 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
218 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
199 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
219 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
200 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob) |
220 saved backup bundle to $TESTTMP/foo/.hg/strip-backup/*-backup.hg (glob) |
|
221 |
|
222 $ hg update -q 2 |
|
223 $ echo x > x |
|
224 $ hg add x |
|
225 $ hg commit -m'x' x |
|
226 created new head |
|
227 $ hg histedit -r 'heads(all())' |
|
228 abort: The specified revisions must have exactly one common root |
|
229 [255] |