Show More
@@ -1,21 +1,20 b'' | |||
|
1 | 1 | #!/bin/sh |
|
2 | 2 | |
|
3 | 3 | hg init |
|
4 | hg branch dummy # needed so -r "" doesn't point to the unnamed/default branch | |
|
5 | 4 | touch a |
|
6 | 5 | hg add a |
|
7 | 6 | hg ci -m "a" -d "1000000 0" |
|
8 | 7 | |
|
9 | 8 | echo 123 > b |
|
10 | 9 | hg add b |
|
11 | 10 | hg diff --nodates |
|
12 | 11 | |
|
13 | 12 | hg diff --nodates -r tip |
|
14 | 13 | |
|
15 | 14 | echo foo > a |
|
16 | 15 | hg diff --nodates |
|
17 | 16 | |
|
18 | 17 | hg diff -r "" |
|
19 | 18 | hg diff -r tip -r "" |
|
20 | 19 | |
|
21 | 20 | true |
@@ -1,22 +1,22 b'' | |||
|
1 | diff -r 4da5fa99f904 b | |
|
1 | diff -r acd8075edac9 b | |
|
2 | 2 | --- /dev/null |
|
3 | 3 | +++ b/b |
|
4 | 4 | @@ -0,0 +1,1 @@ |
|
5 | 5 | +123 |
|
6 | diff -r 4da5fa99f904 b | |
|
6 | diff -r acd8075edac9 b | |
|
7 | 7 | --- /dev/null |
|
8 | 8 | +++ b/b |
|
9 | 9 | @@ -0,0 +1,1 @@ |
|
10 | 10 | +123 |
|
11 | diff -r 4da5fa99f904 a | |
|
11 | diff -r acd8075edac9 a | |
|
12 | 12 | --- a/a |
|
13 | 13 | +++ b/a |
|
14 | 14 | @@ -0,0 +1,1 @@ |
|
15 | 15 | +foo |
|
16 | diff -r 4da5fa99f904 b | |
|
16 | diff -r acd8075edac9 b | |
|
17 | 17 | --- /dev/null |
|
18 | 18 | +++ b/b |
|
19 | 19 | @@ -0,0 +1,1 @@ |
|
20 | 20 | +123 |
|
21 | 21 | abort: Ambiguous identifier! |
|
22 | 22 | abort: Ambiguous identifier! |
@@ -1,89 +1,88 b'' | |||
|
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 | echo a > d |
|
18 | 18 | hg add d |
|
19 | 19 | hg ci -md -d '4 0' |
|
20 | 20 | |
|
21 | 21 | hg mv dir/b e |
|
22 | 22 | hg ci -me -d '5 0' |
|
23 | 23 | |
|
24 | 24 | hg log a |
|
25 | 25 | echo % -f, directory |
|
26 | 26 | hg log -f dir |
|
27 | 27 | echo % -f, but no args |
|
28 | 28 | hg log -f |
|
29 | 29 | echo % one rename |
|
30 | 30 | hg log -vf a |
|
31 | 31 | echo % many renames |
|
32 | 32 | hg log -vf e |
|
33 | 33 | |
|
34 | 34 | echo % log copies |
|
35 | 35 | hg log -vC --template '{rev} {file_copies%filecopy}\n' |
|
36 | 36 | |
|
37 | 37 | echo % log copies, non-linear manifest |
|
38 | 38 | hg up -C 3 |
|
39 | 39 | hg mv dir/b e |
|
40 | 40 | echo foo > foo |
|
41 | 41 | hg ci -Ame2 -d '6 0' |
|
42 | 42 | hg log -vC --template '{rev} {file_copies%filecopy}\n' -r 5 |
|
43 | 43 | |
|
44 | 44 | echo '% log -p d' |
|
45 | 45 | hg log -pv d |
|
46 | 46 | |
|
47 | 47 | # log --follow tests |
|
48 | 48 | hg init ../follow |
|
49 | 49 | cd ../follow |
|
50 | hg branch dummy # needed so -r "" doesn't point to the unnamed/default branch | |
|
51 | 50 | echo base > base |
|
52 | 51 | hg ci -Ambase -d '1 0' |
|
53 | 52 | |
|
54 | 53 | echo r1 >> base |
|
55 | 54 | hg ci -Amr1 -d '1 0' |
|
56 | 55 | echo r2 >> base |
|
57 | 56 | hg ci -Amr2 -d '1 0' |
|
58 | 57 | |
|
59 | 58 | hg up -C 1 |
|
60 | 59 | echo b1 > b1 |
|
61 | 60 | hg ci -Amb1 -d '1 0' |
|
62 | 61 | |
|
63 | 62 | echo % log -f |
|
64 | 63 | hg log -f |
|
65 | 64 | |
|
66 | 65 | hg up -C 0 |
|
67 | 66 | echo b2 > b2 |
|
68 | 67 | hg ci -Amb2 -d '1 0' |
|
69 | 68 | |
|
70 | 69 | echo % log -f -r 1:tip |
|
71 | 70 | hg log -f -r 1:tip |
|
72 | 71 | |
|
73 | 72 | hg up -C 3 |
|
74 | 73 | hg merge tip |
|
75 | 74 | hg ci -mm12 -d '1 0' |
|
76 | 75 | |
|
77 | 76 | echo postm >> b1 |
|
78 | 77 | hg ci -Amb1.1 -d'1 0' |
|
79 | 78 | |
|
80 | 79 | echo % log --follow-first |
|
81 | 80 | hg log --follow-first |
|
82 | 81 | |
|
83 | 82 | echo % log -P 2 |
|
84 | 83 | hg log -P 2 |
|
85 | 84 | |
|
86 | 85 | echo '% log -r ""' |
|
87 | 86 | hg log -r '' |
|
88 | 87 | |
|
89 | 88 | exit 0 |
@@ -1,219 +1,204 b'' | |||
|
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:b30c444c7c84 |
|
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:16b60bf3f99a |
|
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:8580ff50825a |
|
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:b30c444c7c84 |
|
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:21fba396af4c |
|
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:c0296dabce9b |
|
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:8580ff50825a |
|
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 | 79 | % log copies |
|
80 | 80 | 4 e (dir/b) |
|
81 | 81 | 3 b (a) |
|
82 | 82 | 2 dir/b (b) |
|
83 | 83 | 1 b (a) |
|
84 | 84 | 0 |
|
85 | 85 | % log copies, non-linear manifest |
|
86 | 86 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
87 | 87 | adding foo |
|
88 | 88 | 5 e (dir/b) |
|
89 | 89 | % log -p d |
|
90 | 90 | changeset: 3:16b60bf3f99a |
|
91 | 91 | user: test |
|
92 | 92 | date: Thu Jan 01 00:00:04 1970 +0000 |
|
93 | 93 | files: a b d |
|
94 | 94 | description: |
|
95 | 95 | d |
|
96 | 96 | |
|
97 | 97 | |
|
98 | 98 | diff -r 21fba396af4c -r 16b60bf3f99a d |
|
99 | 99 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
100 | 100 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 |
|
101 | 101 | @@ -0,0 +1,1 @@ |
|
102 | 102 | +a |
|
103 | 103 | |
|
104 | 104 | adding base |
|
105 | 105 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
106 | 106 | adding b1 |
|
107 | 107 | % log -f |
|
108 |
changeset: 3: |
|
|
109 | branch: dummy | |
|
108 | changeset: 3:e62f78d544b4 | |
|
110 | 109 | tag: tip |
|
111 |
parent: 1: |
|
|
110 | parent: 1:3d5bf5654eda | |
|
112 | 111 | user: test |
|
113 | 112 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
114 | 113 | summary: b1 |
|
115 | 114 | |
|
116 |
changeset: 1: |
|
|
117 | branch: dummy | |
|
115 | changeset: 1:3d5bf5654eda | |
|
118 | 116 | user: test |
|
119 | 117 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
120 | 118 | summary: r1 |
|
121 | 119 | |
|
122 |
changeset: 0: |
|
|
123 | branch: dummy | |
|
120 | changeset: 0:67e992f2c4f3 | |
|
124 | 121 | user: test |
|
125 | 122 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
126 | 123 | summary: base |
|
127 | 124 | |
|
128 | 125 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
129 | 126 | adding b2 |
|
130 | 127 | % log -f -r 1:tip |
|
131 |
changeset: 1: |
|
|
132 | branch: dummy | |
|
128 | changeset: 1:3d5bf5654eda | |
|
133 | 129 | user: test |
|
134 | 130 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
135 | 131 | summary: r1 |
|
136 | 132 | |
|
137 |
changeset: 2: |
|
|
138 | branch: dummy | |
|
133 | changeset: 2:60c670bf5b30 | |
|
139 | 134 | user: test |
|
140 | 135 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
141 | 136 | summary: r2 |
|
142 | 137 | |
|
143 |
changeset: 3: |
|
|
144 | branch: dummy | |
|
145 | parent: 1:fb3d4e35b279 | |
|
138 | changeset: 3:e62f78d544b4 | |
|
139 | parent: 1:3d5bf5654eda | |
|
146 | 140 | user: test |
|
147 | 141 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
148 | 142 | summary: b1 |
|
149 | 143 | |
|
150 | 144 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
151 | 145 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
152 | 146 | (branch merge, don't forget to commit) |
|
153 | 147 | % log --follow-first |
|
154 |
changeset: 6: |
|
|
155 | branch: dummy | |
|
148 | changeset: 6:2404bbcab562 | |
|
156 | 149 | tag: tip |
|
157 | 150 | user: test |
|
158 | 151 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
159 | 152 | summary: b1.1 |
|
160 | 153 | |
|
161 |
changeset: 5: |
|
|
162 | branch: dummy | |
|
163 |
parent: |
|
|
164 | parent: 4:b76598590bc3 | |
|
154 | changeset: 5:302e9dd6890d | |
|
155 | parent: 3:e62f78d544b4 | |
|
156 | parent: 4:ddb82e70d1a1 | |
|
165 | 157 | user: test |
|
166 | 158 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
167 | 159 | summary: m12 |
|
168 | 160 | |
|
169 |
changeset: 3: |
|
|
170 | branch: dummy | |
|
171 | parent: 1:fb3d4e35b279 | |
|
161 | changeset: 3:e62f78d544b4 | |
|
162 | parent: 1:3d5bf5654eda | |
|
172 | 163 | user: test |
|
173 | 164 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
174 | 165 | summary: b1 |
|
175 | 166 | |
|
176 |
changeset: 1: |
|
|
177 | branch: dummy | |
|
167 | changeset: 1:3d5bf5654eda | |
|
178 | 168 | user: test |
|
179 | 169 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
180 | 170 | summary: r1 |
|
181 | 171 | |
|
182 |
changeset: 0: |
|
|
183 | branch: dummy | |
|
172 | changeset: 0:67e992f2c4f3 | |
|
184 | 173 | user: test |
|
185 | 174 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
186 | 175 | summary: base |
|
187 | 176 | |
|
188 | 177 | % log -P 2 |
|
189 |
changeset: 6: |
|
|
190 | branch: dummy | |
|
178 | changeset: 6:2404bbcab562 | |
|
191 | 179 | tag: tip |
|
192 | 180 | user: test |
|
193 | 181 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
194 | 182 | summary: b1.1 |
|
195 | 183 | |
|
196 |
changeset: 5: |
|
|
197 | branch: dummy | |
|
198 |
parent: |
|
|
199 | parent: 4:b76598590bc3 | |
|
184 | changeset: 5:302e9dd6890d | |
|
185 | parent: 3:e62f78d544b4 | |
|
186 | parent: 4:ddb82e70d1a1 | |
|
200 | 187 | user: test |
|
201 | 188 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
202 | 189 | summary: m12 |
|
203 | 190 | |
|
204 |
changeset: 4: |
|
|
205 | branch: dummy | |
|
206 | parent: 0:ea445bfed6b9 | |
|
191 | changeset: 4:ddb82e70d1a1 | |
|
192 | parent: 0:67e992f2c4f3 | |
|
207 | 193 | user: test |
|
208 | 194 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
209 | 195 | summary: b2 |
|
210 | 196 | |
|
211 |
changeset: 3: |
|
|
212 | branch: dummy | |
|
213 | parent: 1:fb3d4e35b279 | |
|
197 | changeset: 3:e62f78d544b4 | |
|
198 | parent: 1:3d5bf5654eda | |
|
214 | 199 | user: test |
|
215 | 200 | date: Thu Jan 01 00:00:01 1970 +0000 |
|
216 | 201 | summary: b1 |
|
217 | 202 | |
|
218 | 203 | % log -r "" |
|
219 | 204 | abort: Ambiguous identifier! |
General Comments 0
You need to be logged in to leave comments.
Login now