##// END OF EJS Templates
histedit-test: drop skip logic for older mercurial version...
Pierre-Yves David -
r19033:0dc83dbd default
parent child Browse files
Show More
@@ -1,69 +1,65 b''
1 This test requires parentrevspec support in revsets, so check for that
2 and skip the test if we're on an unusual hg that supports .t tests but
3 not parentrevspec.
4 $ python -c 'from mercurial import revset ; revset.methods["parentpost"]' || exit 80
5
1
6 Enable extensions used by this test.
2 Enable extensions used by this test.
7 $ cat >>$HGRCPATH <<EOF
3 $ cat >>$HGRCPATH <<EOF
8 > [extensions]
4 > [extensions]
9 > graphlog=
5 > graphlog=
10 > histedit=
6 > histedit=
11 > EOF
7 > EOF
12
8
13 Repo setup.
9 Repo setup.
14 $ hg init foo
10 $ hg init foo
15 $ cd foo
11 $ cd foo
16 $ echo alpha >> alpha
12 $ echo alpha >> alpha
17 $ hg addr
13 $ hg addr
18 adding alpha
14 adding alpha
19 $ hg ci -m one
15 $ hg ci -m one
20 $ echo alpha >> alpha
16 $ echo alpha >> alpha
21 $ hg ci -m two
17 $ hg ci -m two
22 $ echo alpha >> alpha
18 $ echo alpha >> alpha
23 $ hg ci -m three
19 $ hg ci -m three
24 $ echo alpha >> alpha
20 $ echo alpha >> alpha
25 $ hg ci -m four
21 $ hg ci -m four
26 $ echo alpha >> alpha
22 $ echo alpha >> alpha
27 $ hg ci -m five
23 $ hg ci -m five
28
24
29 $ hg log --style compact --graph
25 $ hg log --style compact --graph
30 @ 4[tip] 08d98a8350f3 1970-01-01 00:00 +0000 test
26 @ 4[tip] 08d98a8350f3 1970-01-01 00:00 +0000 test
31 | five
27 | five
32 |
28 |
33 o 3 c8e68270e35a 1970-01-01 00:00 +0000 test
29 o 3 c8e68270e35a 1970-01-01 00:00 +0000 test
34 | four
30 | four
35 |
31 |
36 o 2 eb57da33312f 1970-01-01 00:00 +0000 test
32 o 2 eb57da33312f 1970-01-01 00:00 +0000 test
37 | three
33 | three
38 |
34 |
39 o 1 579e40513370 1970-01-01 00:00 +0000 test
35 o 1 579e40513370 1970-01-01 00:00 +0000 test
40 | two
36 | two
41 |
37 |
42 o 0 6058cbb6cfd7 1970-01-01 00:00 +0000 test
38 o 0 6058cbb6cfd7 1970-01-01 00:00 +0000 test
43 one
39 one
44
40
45
41
46 Run a dummy edit to make sure we get tip^^ correctly via revsingle.
42 Run a dummy edit to make sure we get tip^^ correctly via revsingle.
47 $ HGEDITOR=cat hg histedit "tip^^"
43 $ HGEDITOR=cat hg histedit "tip^^"
48 pick eb57da33312f 2 three
44 pick eb57da33312f 2 three
49 pick c8e68270e35a 3 four
45 pick c8e68270e35a 3 four
50 pick 08d98a8350f3 4 five
46 pick 08d98a8350f3 4 five
51
47
52 # Edit history between eb57da33312f and 08d98a8350f3
48 # Edit history between eb57da33312f and 08d98a8350f3
53 #
49 #
54 # Commands:
50 # Commands:
55 # p, pick = use commit
51 # p, pick = use commit
56 # e, edit = use commit, but stop for amending
52 # e, edit = use commit, but stop for amending
57 # f, fold = use commit, but fold into previous commit (combines N and N-1)
53 # f, fold = use commit, but fold into previous commit (combines N and N-1)
58 # d, drop = remove commit from history
54 # d, drop = remove commit from history
59 # m, mess = edit message without changing commit content
55 # m, mess = edit message without changing commit content
60 #
56 #
61 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
62
58
63 Run on a revision not ancestors of the current working directory.
59 Run on a revision not ancestors of the current working directory.
64
60
65 $ hg up 2
61 $ hg up 2
66 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
62 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
67 $ hg histedit -r 4
63 $ hg histedit -r 4
68 abort: 08d98a8350f3 is not an ancestor of working directory
64 abort: 08d98a8350f3 is not an ancestor of working directory
69 [255]
65 [255]
General Comments 0
You need to be logged in to leave comments. Login now