Show More
@@ -0,0 +1,70 b'' | |||
|
1 | Test argument handling and various data parsing | |
|
2 | ================================================== | |
|
3 | ||
|
4 | ||
|
5 | Enable extensions used by this test. | |
|
6 | $ cat >>$HGRCPATH <<EOF | |
|
7 | > [extensions] | |
|
8 | > histedit= | |
|
9 | > EOF | |
|
10 | ||
|
11 | Repo setup. | |
|
12 | $ hg init foo | |
|
13 | $ cd foo | |
|
14 | $ echo alpha >> alpha | |
|
15 | $ hg addr | |
|
16 | adding alpha | |
|
17 | $ hg ci -m one | |
|
18 | $ echo alpha >> alpha | |
|
19 | $ hg ci -m two | |
|
20 | $ echo alpha >> alpha | |
|
21 | $ hg ci -m three | |
|
22 | $ echo alpha >> alpha | |
|
23 | $ hg ci -m four | |
|
24 | $ echo alpha >> alpha | |
|
25 | $ hg ci -m five | |
|
26 | ||
|
27 | $ hg log --style compact --graph | |
|
28 | @ 4[tip] 08d98a8350f3 1970-01-01 00:00 +0000 test | |
|
29 | | five | |
|
30 | | | |
|
31 | o 3 c8e68270e35a 1970-01-01 00:00 +0000 test | |
|
32 | | four | |
|
33 | | | |
|
34 | o 2 eb57da33312f 1970-01-01 00:00 +0000 test | |
|
35 | | three | |
|
36 | | | |
|
37 | o 1 579e40513370 1970-01-01 00:00 +0000 test | |
|
38 | | two | |
|
39 | | | |
|
40 | o 0 6058cbb6cfd7 1970-01-01 00:00 +0000 test | |
|
41 | one | |
|
42 | ||
|
43 | ||
|
44 | Run a dummy edit to make sure we get tip^^ correctly via revsingle. | |
|
45 | -------------------------------------------------------------------- | |
|
46 | ||
|
47 | $ HGEDITOR=cat hg histedit "tip^^" | |
|
48 | pick eb57da33312f 2 three | |
|
49 | pick c8e68270e35a 3 four | |
|
50 | pick 08d98a8350f3 4 five | |
|
51 | ||
|
52 | # Edit history between eb57da33312f and 08d98a8350f3 | |
|
53 | # | |
|
54 | # Commands: | |
|
55 | # p, pick = use commit | |
|
56 | # e, edit = use commit, but stop for amending | |
|
57 | # f, fold = use commit, but fold into previous commit (combines N and N-1) | |
|
58 | # d, drop = remove commit from history | |
|
59 | # m, mess = edit message without changing commit content | |
|
60 | # | |
|
61 | 0 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
62 | ||
|
63 | Run on a revision not ancestors of the current working directory. | |
|
64 | -------------------------------------------------------------------- | |
|
65 | ||
|
66 | $ hg up 2 | |
|
67 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
68 | $ hg histedit -r 4 | |
|
69 | abort: 08d98a8350f3 is not an ancestor of working directory | |
|
70 | [255] |
|
1 | NO CONTENT: file was removed |
General Comments 0
You need to be logged in to leave comments.
Login now