Show More
@@ -1,30 +1,65 | |||
|
1 | 1 | #!/bin/sh |
|
2 | 2 | |
|
3 | 3 | hg init a |
|
4 | 4 | |
|
5 | 5 | cd a |
|
6 | 6 | echo a > a |
|
7 | 7 | hg ci -Ama -d '1 0' |
|
8 | 8 | |
|
9 | 9 | hg cp a b |
|
10 | 10 | hg ci -mb -d '2 0' |
|
11 | 11 | |
|
12 | 12 | mkdir dir |
|
13 | 13 | hg mv b dir |
|
14 | 14 | hg ci -mc -d '3 0' |
|
15 | 15 | |
|
16 | 16 | hg mv a b |
|
17 | 17 | hg ci -md -d '4 0' |
|
18 | 18 | |
|
19 | 19 | hg mv dir/b e |
|
20 | 20 | hg ci -me -d '5 0' |
|
21 | 21 | |
|
22 | 22 | hg log a |
|
23 | 23 | echo % -f, directory |
|
24 | 24 | hg log -f dir |
|
25 | 25 | echo % -f, but no args |
|
26 | 26 | hg log -f |
|
27 | 27 | echo % one rename |
|
28 | 28 | hg log -vf a |
|
29 | 29 | echo % many renames |
|
30 | 30 | hg log -vf e |
|
31 | ||
|
32 | # log --follow tests | |
|
33 | hg init ../follow | |
|
34 | cd ../follow | |
|
35 | echo base > base | |
|
36 | hg ci -Ambase -d '1 0' | |
|
37 | ||
|
38 | echo r1 >> base | |
|
39 | hg ci -Amr1 -d '1 0' | |
|
40 | echo r2 >> base | |
|
41 | hg ci -Amr2 -d '1 0' | |
|
42 | ||
|
43 | hg up -C 1 | |
|
44 | echo b1 > b1 | |
|
45 | hg ci -Amb1 -d '1 0' | |
|
46 | ||
|
47 | echo % log -f | |
|
48 | hg log -f | |
|
49 | ||
|
50 | hg up -C 0 | |
|
51 | echo b2 > b2 | |
|
52 | hg ci -Amb2 -d '1 0' | |
|
53 | ||
|
54 | echo % log -f -r 1:tip | |
|
55 | hg log -f -r 1:tip | |
|
56 | ||
|
57 | hg up -C 3 | |
|
58 | hg merge tip | |
|
59 | hg ci -mm12 -d '1 0' | |
|
60 | ||
|
61 | echo postm >> b1 | |
|
62 | hg ci -Amb1.1 -d'1 0' | |
|
63 | ||
|
64 | echo % log --follow-first | |
|
65 | hg log --follow-first |
@@ -1,78 +1,151 | |||
|
1 | 1 | adding a |
|
2 | 2 | changeset: 0:8580ff50825a |
|
3 | 3 | user: test |
|
4 | 4 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
5 | 5 | summary: a |
|
6 | 6 | |
|
7 | 7 | % -f, directory |
|
8 | 8 | abort: can only follow copies/renames for explicit file names |
|
9 | 9 | % -f, but no args |
|
10 | 10 | changeset: 4:8c1c8408f737 |
|
11 | 11 | tag: tip |
|
12 | 12 | user: test |
|
13 | 13 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
14 | 14 | summary: e |
|
15 | 15 | |
|
16 | 16 | changeset: 3:c4ba038c90ce |
|
17 | 17 | user: test |
|
18 | 18 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
19 | 19 | summary: d |
|
20 | 20 | |
|
21 | 21 | changeset: 2:21fba396af4c |
|
22 | 22 | user: test |
|
23 | 23 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
24 | 24 | summary: c |
|
25 | 25 | |
|
26 | 26 | changeset: 1:c0296dabce9b |
|
27 | 27 | user: test |
|
28 | 28 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
29 | 29 | summary: b |
|
30 | 30 | |
|
31 | 31 | changeset: 0:8580ff50825a |
|
32 | 32 | user: test |
|
33 | 33 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
34 | 34 | summary: a |
|
35 | 35 | |
|
36 | 36 | % one rename |
|
37 | 37 | changeset: 0:8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
38 | 38 | user: test |
|
39 | 39 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
40 | 40 | files: a |
|
41 | 41 | description: |
|
42 | 42 | a |
|
43 | 43 | |
|
44 | 44 | |
|
45 | 45 | % many renames |
|
46 | 46 | changeset: 4:8c1c8408f7371319750ea2d4fa7969828effbcf4 |
|
47 | 47 | tag: tip |
|
48 | 48 | user: test |
|
49 | 49 | date: Thu Jan 01 00:00:05 1970 +0000 |
|
50 | 50 | files: dir/b e |
|
51 | 51 | description: |
|
52 | 52 | e |
|
53 | 53 | |
|
54 | 54 | |
|
55 | 55 | changeset: 2:21fba396af4c801f9717de6c415b6cc9620437e8 |
|
56 | 56 | user: test |
|
57 | 57 | date: Thu Jan 01 00:00:03 1970 +0000 |
|
58 | 58 | files: b dir/b |
|
59 | 59 | description: |
|
60 | 60 | c |
|
61 | 61 | |
|
62 | 62 | |
|
63 | 63 | changeset: 1:c0296dabce9bf0cd3fdd608de26693c91cd6bbf4 |
|
64 | 64 | user: test |
|
65 | 65 | date: Thu Jan 01 00:00:02 1970 +0000 |
|
66 | 66 | files: b |
|
67 | 67 | description: |
|
68 | 68 | b |
|
69 | 69 | |
|
70 | 70 | |
|
71 | 71 | changeset: 0:8580ff50825a50c8f716709acdf8de0deddcd6ab |
|
72 | 72 | user: test |
|
73 | 73 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
74 | 74 | files: a |
|
75 | 75 | description: |
|
76 | 76 | a |
|
77 | 77 | |
|
78 | 78 | |
|
79 | adding base | |
|
80 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
81 | adding b1 | |
|
82 | % log -f | |
|
83 | changeset: 3:e62f78d544b4 | |
|
84 | tag: tip | |
|
85 | parent: 1:3d5bf5654eda | |
|
86 | user: test | |
|
87 | date: Thu Jan 01 00:00:01 1970 +0000 | |
|
88 | summary: b1 | |
|
89 | ||
|
90 | changeset: 1:3d5bf5654eda | |
|
91 | user: test | |
|
92 | date: Thu Jan 01 00:00:01 1970 +0000 | |
|
93 | summary: r1 | |
|
94 | ||
|
95 | changeset: 0:67e992f2c4f3 | |
|
96 | user: test | |
|
97 | date: Thu Jan 01 00:00:01 1970 +0000 | |
|
98 | summary: base | |
|
99 | ||
|
100 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
101 | adding b2 | |
|
102 | % log -f -r 1:tip | |
|
103 | changeset: 1:3d5bf5654eda | |
|
104 | user: test | |
|
105 | date: Thu Jan 01 00:00:01 1970 +0000 | |
|
106 | summary: r1 | |
|
107 | ||
|
108 | changeset: 2:60c670bf5b30 | |
|
109 | user: test | |
|
110 | date: Thu Jan 01 00:00:01 1970 +0000 | |
|
111 | summary: r2 | |
|
112 | ||
|
113 | changeset: 3:e62f78d544b4 | |
|
114 | parent: 1:3d5bf5654eda | |
|
115 | user: test | |
|
116 | date: Thu Jan 01 00:00:01 1970 +0000 | |
|
117 | summary: b1 | |
|
118 | ||
|
119 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
120 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
|
121 | (branch merge, don't forget to commit) | |
|
122 | % log --follow-first | |
|
123 | changeset: 6:2404bbcab562 | |
|
124 | tag: tip | |
|
125 | user: test | |
|
126 | date: Thu Jan 01 00:00:01 1970 +0000 | |
|
127 | summary: b1.1 | |
|
128 | ||
|
129 | changeset: 5:302e9dd6890d | |
|
130 | parent: 3:e62f78d544b4 | |
|
131 | parent: 4:ddb82e70d1a1 | |
|
132 | user: test | |
|
133 | date: Thu Jan 01 00:00:01 1970 +0000 | |
|
134 | summary: m12 | |
|
135 | ||
|
136 | changeset: 3:e62f78d544b4 | |
|
137 | parent: 1:3d5bf5654eda | |
|
138 | user: test | |
|
139 | date: Thu Jan 01 00:00:01 1970 +0000 | |
|
140 | summary: b1 | |
|
141 | ||
|
142 | changeset: 1:3d5bf5654eda | |
|
143 | user: test | |
|
144 | date: Thu Jan 01 00:00:01 1970 +0000 | |
|
145 | summary: r1 | |
|
146 | ||
|
147 | changeset: 0:67e992f2c4f3 | |
|
148 | user: test | |
|
149 | date: Thu Jan 01 00:00:01 1970 +0000 | |
|
150 | summary: base | |
|
151 |
General Comments 0
You need to be logged in to leave comments.
Login now