Show More
This diff has been collapsed as it changes many lines, (1146 lines changed) Show them Hide them | |||||
@@ -1,208 +1,855 b'' | |||||
1 | #!/bin/sh |
|
1 | $ hg init a | |
2 |
|
2 | |||
3 | hg init a |
|
3 | $ cd a | |
|
4 | $ echo a > a | |||
|
5 | $ hg ci -Ama -d '1 0' | |||
|
6 | adding a | |||
4 |
|
7 | |||
5 | cd a |
|
8 | $ hg cp a b | |
6 | echo a > a |
|
9 | $ hg ci -mb -d '2 0' | |
7 | hg ci -Ama -d '1 0' |
|
|||
8 |
|
10 | |||
9 | hg cp a b |
|
11 | $ mkdir dir | |
10 | hg ci -mb -d '2 0' |
|
12 | $ hg mv b dir | |
|
13 | $ hg ci -mc -d '3 0' | |||
11 |
|
14 | |||
12 | mkdir dir |
|
15 | $ hg mv a b | |
13 | hg mv b dir |
|
16 | $ echo a > d | |
14 | hg ci -mc -d '3 0' |
|
17 | $ hg add d | |
|
18 | $ hg ci -md -d '4 0' | |||
|
19 | ||||
|
20 | $ hg mv dir/b e | |||
|
21 | $ hg ci -me -d '5 0' | |||
15 |
|
22 | |||
16 | hg mv a b |
|
23 | $ hg log a | |
17 | echo a > d |
|
24 | changeset: 0:8580ff50825a | |
18 | hg add d |
|
25 | user: test | |
19 | hg ci -md -d '4 0' |
|
26 | date: Thu Jan 01 00:00:01 1970 +0000 | |
|
27 | summary: a | |||
|
28 | ||||
20 |
|
29 | |||
21 | hg mv dir/b e |
|
30 | -f, directory | |
22 | hg ci -me -d '5 0' |
|
31 | ||
|
32 | $ hg log -f dir | |||
|
33 | abort: cannot follow nonexistent file: "dir" | |||
|
34 | ||||
|
35 | -f, but no args | |||
23 |
|
36 | |||
24 |
hg log |
|
37 | $ hg log -f | |
25 | echo % -f, directory |
|
38 | changeset: 4:66c1345dc4f9 | |
26 | hg log -f dir |
|
39 | tag: tip | |
27 | echo % -f, but no args |
|
40 | user: test | |
28 | hg log -f |
|
41 | date: Thu Jan 01 00:00:05 1970 +0000 | |
29 | echo % one rename |
|
42 | summary: e | |
30 | hg log -vf a |
|
43 | ||
31 | echo % many renames |
|
44 | changeset: 3:7c6c671bb7cc | |
32 | hg log -vf e |
|
45 | user: test | |
|
46 | date: Thu Jan 01 00:00:04 1970 +0000 | |||
|
47 | summary: d | |||
|
48 | ||||
|
49 | changeset: 2:41dd4284081e | |||
|
50 | user: test | |||
|
51 | date: Thu Jan 01 00:00:03 1970 +0000 | |||
|
52 | summary: c | |||
|
53 | ||||
|
54 | changeset: 1:784de7cef101 | |||
|
55 | user: test | |||
|
56 | date: Thu Jan 01 00:00:02 1970 +0000 | |||
|
57 | summary: b | |||
|
58 | ||||
|
59 | changeset: 0:8580ff50825a | |||
|
60 | user: test | |||
|
61 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
62 | summary: a | |||
|
63 | ||||
33 |
|
64 | |||
34 | echo % log -pf dir/b |
|
65 | one rename | |
35 | hg log -pf dir/b |
|
|||
36 | echo % log -vf dir/b |
|
|||
37 | hg log -vf dir/b |
|
|||
38 |
|
66 | |||
39 | echo '% log copies with --copies' |
|
67 | $ hg log -vf a | |
40 | hg log -vC --template '{rev} {file_copies}\n' |
|
68 | changeset: 0:8580ff50825a | |
41 | echo '% log copies switch without --copies, with old filecopy template' |
|
69 | user: test | |
42 | hg log -v --template '{rev} {file_copies_switch%filecopy}\n' |
|
70 | date: Thu Jan 01 00:00:01 1970 +0000 | |
43 | echo '% log copies switch with --copies' |
|
71 | files: a | |
44 | hg log -vC --template '{rev} {file_copies_switch}\n' |
|
72 | description: | |
|
73 | a | |||
|
74 | ||||
|
75 | ||||
45 |
|
76 | |||
46 | echo '% log copies with hardcoded style and with --style=default' |
|
77 | many renames | |
47 | hg log -vC -r4 |
|
|||
48 | hg log -vC -r4 --style=default |
|
|||
49 |
|
78 | |||
50 | echo % log copies, non-linear manifest |
|
79 | $ hg log -vf e | |
51 | hg up -C 3 |
|
80 | changeset: 4:66c1345dc4f9 | |
52 | hg mv dir/b e |
|
81 | tag: tip | |
53 | echo foo > foo |
|
82 | user: test | |
54 | hg ci -Ame2 -d '6 0' |
|
83 | date: Thu Jan 01 00:00:05 1970 +0000 | |
55 | hg log -v --template '{rev} {file_copies}\n' -r 5 |
|
84 | files: dir/b e | |
56 |
|
85 | description: | ||
57 | echo % log copies, execute bit set |
|
86 | e | |
58 | chmod +x e |
|
87 | ||
59 | hg ci -me3 -d '7 0' |
|
88 | ||
60 | hg log -v --template '{rev} {file_copies}\n' -r 6 |
|
89 | changeset: 2:41dd4284081e | |
|
90 | user: test | |||
|
91 | date: Thu Jan 01 00:00:03 1970 +0000 | |||
|
92 | files: b dir/b | |||
|
93 | description: | |||
|
94 | c | |||
|
95 | ||||
|
96 | ||||
|
97 | changeset: 1:784de7cef101 | |||
|
98 | user: test | |||
|
99 | date: Thu Jan 01 00:00:02 1970 +0000 | |||
|
100 | files: b | |||
|
101 | description: | |||
|
102 | b | |||
|
103 | ||||
|
104 | ||||
|
105 | changeset: 0:8580ff50825a | |||
|
106 | user: test | |||
|
107 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
108 | files: a | |||
|
109 | description: | |||
|
110 | a | |||
|
111 | ||||
|
112 | ||||
61 |
|
113 | |||
62 | echo '% log -p d' |
|
|||
63 | hg log -pv d |
|
|||
64 |
|
114 | |||
65 | echo '% log --removed file' |
|
115 | log -pf dir/b | |
66 | hg log --removed -v a |
|
|||
67 | echo '% log --removed revrange file' |
|
|||
68 | hg log --removed -v -r0:2 a |
|
|||
69 |
|
||||
70 | # log --follow tests |
|
|||
71 | hg init ../follow |
|
|||
72 | cd ../follow |
|
|||
73 |
|
116 | |||
74 | echo base > base |
|
117 | $ hg log -pf dir/b | |
75 | hg ci -Ambase -d '1 0' |
|
118 | changeset: 2:41dd4284081e | |
|
119 | user: test | |||
|
120 | date: Thu Jan 01 00:00:03 1970 +0000 | |||
|
121 | summary: c | |||
|
122 | ||||
|
123 | diff -r 784de7cef101 -r 41dd4284081e dir/b | |||
|
124 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
125 | +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000 | |||
|
126 | @@ -0,0 +1,1 @@ | |||
|
127 | +a | |||
|
128 | ||||
|
129 | changeset: 1:784de7cef101 | |||
|
130 | user: test | |||
|
131 | date: Thu Jan 01 00:00:02 1970 +0000 | |||
|
132 | summary: b | |||
|
133 | ||||
|
134 | diff -r 8580ff50825a -r 784de7cef101 b | |||
|
135 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
136 | +++ b/b Thu Jan 01 00:00:02 1970 +0000 | |||
|
137 | @@ -0,0 +1,1 @@ | |||
|
138 | +a | |||
|
139 | ||||
|
140 | changeset: 0:8580ff50825a | |||
|
141 | user: test | |||
|
142 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
143 | summary: a | |||
|
144 | ||||
|
145 | diff -r 000000000000 -r 8580ff50825a a | |||
|
146 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
147 | +++ b/a Thu Jan 01 00:00:01 1970 +0000 | |||
|
148 | @@ -0,0 +1,1 @@ | |||
|
149 | +a | |||
|
150 | ||||
76 |
|
151 | |||
77 | echo r1 >> base |
|
152 | log -vf dir/b | |
78 | hg ci -Amr1 -d '1 0' |
|
|||
79 | echo r2 >> base |
|
|||
80 | hg ci -Amr2 -d '1 0' |
|
|||
81 |
|
||||
82 | hg up -C 1 |
|
|||
83 | echo b1 > b1 |
|
|||
84 | hg ci -Amb1 -d '1 0' |
|
|||
85 |
|
153 | |||
86 | echo % log -f |
|
154 | $ hg log -vf dir/b | |
87 | hg log -f |
|
155 | changeset: 2:41dd4284081e | |
|
156 | user: test | |||
|
157 | date: Thu Jan 01 00:00:03 1970 +0000 | |||
|
158 | files: b dir/b | |||
|
159 | description: | |||
|
160 | c | |||
|
161 | ||||
|
162 | ||||
|
163 | changeset: 1:784de7cef101 | |||
|
164 | user: test | |||
|
165 | date: Thu Jan 01 00:00:02 1970 +0000 | |||
|
166 | files: b | |||
|
167 | description: | |||
|
168 | b | |||
|
169 | ||||
|
170 | ||||
|
171 | changeset: 0:8580ff50825a | |||
|
172 | user: test | |||
|
173 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
174 | files: a | |||
|
175 | description: | |||
|
176 | a | |||
|
177 | ||||
|
178 | ||||
88 |
|
179 | |||
89 | hg up -C 0 |
|
180 | ||
90 | echo b2 > b2 |
|
181 | log copies with --copies | |
91 | hg ci -Amb2 -d '1 0' |
|
182 | ||
|
183 | $ hg log -vC --template '{rev} {file_copies}\n' | |||
|
184 | 4 e (dir/b) | |||
|
185 | 3 b (a) | |||
|
186 | 2 dir/b (b) | |||
|
187 | 1 b (a) | |||
|
188 | 0 | |||
92 |
|
189 | |||
93 | echo % log -f -r 1:tip |
|
190 | log copies switch without --copies, with old filecopy template | |
94 | hg log -f -r 1:tip |
|
|||
95 |
|
191 | |||
96 | hg up -C 3 |
|
192 | $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n' | |
97 | hg merge tip |
|
193 | 4 | |
|
194 | 3 | |||
|
195 | 2 | |||
|
196 | 1 | |||
|
197 | 0 | |||
|
198 | ||||
|
199 | log copies switch with --copies | |||
98 |
|
200 | |||
99 | echo % log -r . with two parents |
|
201 | $ hg log -vC --template '{rev} {file_copies_switch}\n' | |
100 | hg log -r . |
|
202 | 4 e (dir/b) | |
101 |
|
203 | 3 b (a) | ||
102 | hg ci -mm12 -d '1 0' |
|
204 | 2 dir/b (b) | |
|
205 | 1 b (a) | |||
|
206 | 0 | |||
103 |
|
207 | |||
104 | echo % log -r . with one parent |
|
|||
105 | hg log -r . |
|
|||
106 |
|
208 | |||
107 | echo postm >> b1 |
|
209 | log copies with hardcoded style and with --style=default | |
108 | hg ci -Amb1.1 -d'1 0' |
|
|||
109 |
|
210 | |||
110 | echo % log --follow-first |
|
211 | $ hg log -vC -r4 | |
111 | hg log --follow-first |
|
212 | changeset: 4:66c1345dc4f9 | |
112 |
|
213 | tag: tip | ||
113 | echo % log -P 2 |
|
214 | user: test | |
114 | hg log -P 2 |
|
215 | date: Thu Jan 01 00:00:05 1970 +0000 | |
|
216 | files: dir/b e | |||
|
217 | copies: e (dir/b) | |||
|
218 | description: | |||
|
219 | e | |||
|
220 | ||||
|
221 | ||||
|
222 | $ hg log -vC -r4 --style=default | |||
|
223 | changeset: 4:66c1345dc4f9 | |||
|
224 | tag: tip | |||
|
225 | user: test | |||
|
226 | date: Thu Jan 01 00:00:05 1970 +0000 | |||
|
227 | files: dir/b e | |||
|
228 | copies: e (dir/b) | |||
|
229 | description: | |||
|
230 | e | |||
|
231 | ||||
|
232 | ||||
115 |
|
233 | |||
116 | echo '% log -r tip -p --git' |
|
234 | ||
117 | hg log -r tip -p --git |
|
235 | log copies, non-linear manifest | |
118 |
|
236 | |||
119 | echo '% log -r ""' |
|
237 | $ hg up -C 3 | |
120 | hg log -r '' |
|
238 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
239 | $ hg mv dir/b e | |||
|
240 | $ echo foo > foo | |||
|
241 | $ hg ci -Ame2 -d '6 0' | |||
|
242 | adding foo | |||
|
243 | created new head | |||
|
244 | $ hg log -v --template '{rev} {file_copies}\n' -r 5 | |||
|
245 | 5 e (dir/b) | |||
|
246 | ||||
121 |
|
247 | |||
122 | echo '% log -r <some unknown node id>' |
|
248 | log copies, execute bit set | |
123 | hg log -r 1000000000000000000000000000000000000000 |
|
|||
124 |
|
||||
125 | echo '% log -k r1' |
|
|||
126 | hg log -k r1 |
|
|||
127 |
|
249 | |||
128 | echo '% log -d -1' |
|
250 | $ chmod +x e | |
129 | hg log -d -1 |
|
251 | $ hg ci -me3 -d '7 0' | |
|
252 | $ hg log -v --template '{rev} {file_copies}\n' -r 6 | |||
|
253 | 6 | |||
130 |
|
254 | |||
131 | echo '% log -p -l2 --color=always' |
|
255 | ||
132 | hg --config extensions.color= --config color.mode=ansi \ |
|
256 | log -p d | |
133 | log -p -l2 --color=always |
|
|||
134 |
|
257 | |||
135 | echo '% log -r tip --stat' |
|
258 | $ hg log -pv d | |
136 | hg log -r tip --stat |
|
259 | changeset: 3:7c6c671bb7cc | |
|
260 | user: test | |||
|
261 | date: Thu Jan 01 00:00:04 1970 +0000 | |||
|
262 | files: a b d | |||
|
263 | description: | |||
|
264 | d | |||
|
265 | ||||
|
266 | ||||
|
267 | diff -r 41dd4284081e -r 7c6c671bb7cc d | |||
|
268 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
269 | +++ b/d Thu Jan 01 00:00:04 1970 +0000 | |||
|
270 | @@ -0,0 +1,1 @@ | |||
|
271 | +a | |||
|
272 | ||||
137 |
|
273 | |||
138 | cd .. |
|
274 | ||
|
275 | log --removed file | |||
139 |
|
276 | |||
140 | hg init usertest |
|
277 | $ hg log --removed -v a | |
141 | cd usertest |
|
278 | changeset: 3:7c6c671bb7cc | |
|
279 | user: test | |||
|
280 | date: Thu Jan 01 00:00:04 1970 +0000 | |||
|
281 | files: a b d | |||
|
282 | description: | |||
|
283 | d | |||
|
284 | ||||
|
285 | ||||
|
286 | changeset: 0:8580ff50825a | |||
|
287 | user: test | |||
|
288 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
289 | files: a | |||
|
290 | description: | |||
|
291 | a | |||
|
292 | ||||
|
293 | ||||
142 |
|
294 | |||
143 | echo a > a |
|
295 | log --removed revrange file | |
144 | hg ci -A -m "a" -u "User One <user1@example.org>" |
|
|||
145 | echo b > b |
|
|||
146 | hg ci -A -m "b" -u "User Two <user2@example.org>" |
|
|||
147 |
|
296 | |||
148 | hg log -u "User One <user1@example.org>" |
|
297 | $ hg log --removed -v -r0:2 a | |
149 | hg log -u "user1" -u "user2" |
|
298 | changeset: 0:8580ff50825a | |
150 | hg log -u "user3" |
|
299 | user: test | |
|
300 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
301 | files: a | |||
|
302 | description: | |||
|
303 | a | |||
|
304 | ||||
|
305 | ||||
|
306 | ||||
151 |
|
307 | |||
152 | cd .. |
|
308 | log --follow tests | |
|
309 | ||||
|
310 | $ hg init ../follow | |||
|
311 | $ cd ../follow | |||
153 |
|
312 | |||
154 | hg init branches |
|
313 | $ echo base > base | |
155 | cd branches |
|
314 | $ hg ci -Ambase -d '1 0' | |
|
315 | adding base | |||
|
316 | ||||
|
317 | $ echo r1 >> base | |||
|
318 | $ hg ci -Amr1 -d '1 0' | |||
|
319 | $ echo r2 >> base | |||
|
320 | $ hg ci -Amr2 -d '1 0' | |||
156 |
|
321 | |||
157 | echo a > a |
|
322 | $ hg up -C 1 | |
158 | hg ci -A -m "commit on default" |
|
323 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
159 | hg branch test |
|
324 | $ echo b1 > b1 | |
160 | echo b > b |
|
325 | $ hg ci -Amb1 -d '1 0' | |
161 | hg ci -A -m "commit on test" |
|
326 | adding b1 | |
|
327 | created new head | |||
|
328 | ||||
|
329 | ||||
|
330 | log -f | |||
162 |
|
331 | |||
163 | hg up default |
|
332 | $ hg log -f | |
164 | echo c > c |
|
333 | changeset: 3:e62f78d544b4 | |
165 | hg ci -A -m "commit on default" |
|
334 | tag: tip | |
166 | hg up test |
|
335 | parent: 1:3d5bf5654eda | |
167 | echo c > c |
|
336 | user: test | |
168 | hg ci -A -m "commit on test" |
|
337 | date: Thu Jan 01 00:00:01 1970 +0000 | |
|
338 | summary: b1 | |||
|
339 | ||||
|
340 | changeset: 1:3d5bf5654eda | |||
|
341 | user: test | |||
|
342 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
343 | summary: r1 | |||
|
344 | ||||
|
345 | changeset: 0:67e992f2c4f3 | |||
|
346 | user: test | |||
|
347 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
348 | summary: base | |||
|
349 | ||||
169 |
|
350 | |||
170 | echo '% log -b default' |
|
351 | ||
171 | hg log -b default |
|
352 | log -f -r 1:tip | |
172 |
|
353 | |||
173 | echo '% log -b test' |
|
354 | $ hg up -C 0 | |
174 | hg log -b test |
|
355 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
175 |
|
356 | $ echo b2 > b2 | ||
176 | echo '% log -b dummy' |
|
357 | $ hg ci -Amb2 -d '1 0' | |
177 | hg log -b dummy |
|
358 | adding b2 | |
|
359 | created new head | |||
|
360 | $ hg log -f -r 1:tip | |||
|
361 | changeset: 1:3d5bf5654eda | |||
|
362 | user: test | |||
|
363 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
364 | summary: r1 | |||
|
365 | ||||
|
366 | changeset: 2:60c670bf5b30 | |||
|
367 | user: test | |||
|
368 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
369 | summary: r2 | |||
|
370 | ||||
|
371 | changeset: 3:e62f78d544b4 | |||
|
372 | parent: 1:3d5bf5654eda | |||
|
373 | user: test | |||
|
374 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
375 | summary: b1 | |||
|
376 | ||||
178 |
|
377 | |||
179 | echo '% log -b .' |
|
|||
180 | hg log -b . |
|
|||
181 |
|
378 | |||
182 | echo '% log -b default -b test' |
|
379 | log -r . with two parents | |
183 | hg log -b default -b test |
|
|||
184 |
|
380 | |||
185 | echo '% log -b default -b .' |
|
381 | $ hg up -C 3 | |
186 | hg log -b default -b . |
|
382 | 2 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
|
383 | $ hg merge tip | |||
|
384 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
385 | (branch merge, don't forget to commit) | |||
|
386 | $ hg log -r . | |||
|
387 | changeset: 3:e62f78d544b4 | |||
|
388 | parent: 1:3d5bf5654eda | |||
|
389 | user: test | |||
|
390 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
391 | summary: b1 | |||
|
392 | ||||
187 |
|
393 | |||
188 | echo '% log -b . -b test' |
|
|||
189 | hg log -b . -b test |
|
|||
190 |
|
394 | |||
191 | echo '% log -b 2' |
|
395 | log -r . with one parent | |
192 | hg log -b 2 |
|
|||
193 |
|
396 | |||
194 | echo '% log -p --cwd dir (in subdir)' |
|
397 | $ hg ci -mm12 -d '1 0' | |
195 | mkdir dir |
|
398 | $ hg log -r . | |
196 | hg log -p --cwd dir |
|
399 | changeset: 5:302e9dd6890d | |
|
400 | tag: tip | |||
|
401 | parent: 3:e62f78d544b4 | |||
|
402 | parent: 4:ddb82e70d1a1 | |||
|
403 | user: test | |||
|
404 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
405 | summary: m12 | |||
|
406 | ||||
197 |
|
407 | |||
198 | echo '% log -p -R repo' |
|
408 | $ echo postm >> b1 | |
199 | cd dir |
|
409 | $ hg ci -Amb1.1 -d'1 0' | |
200 | hg log -p -R .. ../a |
|
|||
201 |
|
410 | |||
202 |
|
411 | |||
203 | cd .. |
|
412 | log --follow-first | |
204 | hg init follow2 |
|
413 | ||
205 | cd follow2 |
|
414 | $ hg log --follow-first | |
|
415 | changeset: 6:2404bbcab562 | |||
|
416 | tag: tip | |||
|
417 | user: test | |||
|
418 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
419 | summary: b1.1 | |||
|
420 | ||||
|
421 | changeset: 5:302e9dd6890d | |||
|
422 | parent: 3:e62f78d544b4 | |||
|
423 | parent: 4:ddb82e70d1a1 | |||
|
424 | user: test | |||
|
425 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
426 | summary: m12 | |||
|
427 | ||||
|
428 | changeset: 3:e62f78d544b4 | |||
|
429 | parent: 1:3d5bf5654eda | |||
|
430 | user: test | |||
|
431 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
432 | summary: b1 | |||
|
433 | ||||
|
434 | changeset: 1:3d5bf5654eda | |||
|
435 | user: test | |||
|
436 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
437 | summary: r1 | |||
|
438 | ||||
|
439 | changeset: 0:67e992f2c4f3 | |||
|
440 | user: test | |||
|
441 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
442 | summary: base | |||
|
443 | ||||
|
444 | ||||
|
445 | ||||
|
446 | log -P 2 | |||
|
447 | ||||
|
448 | $ hg log -P 2 | |||
|
449 | changeset: 6:2404bbcab562 | |||
|
450 | tag: tip | |||
|
451 | user: test | |||
|
452 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
453 | summary: b1.1 | |||
|
454 | ||||
|
455 | changeset: 5:302e9dd6890d | |||
|
456 | parent: 3:e62f78d544b4 | |||
|
457 | parent: 4:ddb82e70d1a1 | |||
|
458 | user: test | |||
|
459 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
460 | summary: m12 | |||
|
461 | ||||
|
462 | changeset: 4:ddb82e70d1a1 | |||
|
463 | parent: 0:67e992f2c4f3 | |||
|
464 | user: test | |||
|
465 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
466 | summary: b2 | |||
|
467 | ||||
|
468 | changeset: 3:e62f78d544b4 | |||
|
469 | parent: 1:3d5bf5654eda | |||
|
470 | user: test | |||
|
471 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
472 | summary: b1 | |||
|
473 | ||||
|
474 | ||||
|
475 | ||||
|
476 | log -r tip -p --git | |||
|
477 | ||||
|
478 | $ hg log -r tip -p --git | |||
|
479 | changeset: 6:2404bbcab562 | |||
|
480 | tag: tip | |||
|
481 | user: test | |||
|
482 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
483 | summary: b1.1 | |||
|
484 | ||||
|
485 | diff --git a/b1 b/b1 | |||
|
486 | --- a/b1 | |||
|
487 | +++ b/b1 | |||
|
488 | @@ -1,1 +1,2 @@ | |||
|
489 | b1 | |||
|
490 | +postm | |||
|
491 | ||||
|
492 | ||||
|
493 | ||||
|
494 | log -r "" | |||
|
495 | ||||
|
496 | $ hg log -r '' | |||
|
497 | hg: parse error: empty query | |||
|
498 | ||||
|
499 | log -r <some unknown node id> | |||
|
500 | ||||
|
501 | $ hg log -r 1000000000000000000000000000000000000000 | |||
|
502 | abort: unknown revision '1000000000000000000000000000000000000000'! | |||
|
503 | ||||
|
504 | log -k r1 | |||
|
505 | ||||
|
506 | $ hg log -k r1 | |||
|
507 | changeset: 1:3d5bf5654eda | |||
|
508 | user: test | |||
|
509 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
510 | summary: r1 | |||
|
511 | ||||
|
512 | ||||
|
513 | ||||
|
514 | log -d -1 | |||
|
515 | ||||
|
516 | $ hg log -d -1 | |||
|
517 | ||||
|
518 | ||||
|
519 | log -p -l2 --color=always | |||
|
520 | ||||
|
521 | $ hg --config extensions.color= --config color.mode=ansi \ | |||
|
522 | > log -p -l2 --color=always | |||
|
523 | [0;33mchangeset: 6:2404bbcab562[0m | |||
|
524 | tag: tip | |||
|
525 | user: test | |||
|
526 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
527 | summary: b1.1 | |||
|
528 | ||||
|
529 | [0;1mdiff -r 302e9dd6890d -r 2404bbcab562 b1[0m | |||
|
530 | [0;31;1m--- a/b1 Thu Jan 01 00:00:01 1970 +0000[0m | |||
|
531 | [0;32;1m+++ b/b1 Thu Jan 01 00:00:01 1970 +0000[0m | |||
|
532 | [0;35m@@ -1,1 +1,2 @@[0m | |||
|
533 | b1 | |||
|
534 | [0;32m+postm[0m | |||
|
535 | ||||
|
536 | [0;33mchangeset: 5:302e9dd6890d[0m | |||
|
537 | parent: 3:e62f78d544b4 | |||
|
538 | parent: 4:ddb82e70d1a1 | |||
|
539 | user: test | |||
|
540 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
541 | summary: m12 | |||
|
542 | ||||
|
543 | [0;1mdiff -r e62f78d544b4 -r 302e9dd6890d b2[0m | |||
|
544 | [0;31;1m--- /dev/null Thu Jan 01 00:00:00 1970 +0000[0m | |||
|
545 | [0;32;1m+++ b/b2 Thu Jan 01 00:00:01 1970 +0000[0m | |||
|
546 | [0;35m@@ -0,0 +1,1 @@[0m | |||
|
547 | [0;32m+b2[0m | |||
|
548 | ||||
|
549 | ||||
|
550 | ||||
|
551 | log -r tip --stat | |||
|
552 | ||||
|
553 | $ hg log -r tip --stat | |||
|
554 | changeset: 6:2404bbcab562 | |||
|
555 | tag: tip | |||
|
556 | user: test | |||
|
557 | date: Thu Jan 01 00:00:01 1970 +0000 | |||
|
558 | summary: b1.1 | |||
|
559 | ||||
|
560 | b1 | 1 + | |||
|
561 | 1 files changed, 1 insertions(+), 0 deletions(-) | |||
|
562 | ||||
|
563 | ||||
|
564 | $ cd .. | |||
|
565 | ||||
|
566 | $ hg init usertest | |||
|
567 | $ cd usertest | |||
|
568 | ||||
|
569 | $ echo a > a | |||
|
570 | $ hg ci -A -m "a" -u "User One <user1@example.org>" | |||
|
571 | adding a | |||
|
572 | $ echo b > b | |||
|
573 | $ hg ci -A -m "b" -u "User Two <user2@example.org>" | |||
|
574 | adding b | |||
|
575 | ||||
|
576 | $ hg log -u "User One <user1@example.org>" | |||
|
577 | changeset: 0:29a4c94f1924 | |||
|
578 | user: User One <user1@example.org> | |||
|
579 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
580 | summary: a | |||
|
581 | ||||
|
582 | $ hg log -u "user1" -u "user2" | |||
|
583 | changeset: 1:e834b5e69c0e | |||
|
584 | tag: tip | |||
|
585 | user: User Two <user2@example.org> | |||
|
586 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
587 | summary: b | |||
|
588 | ||||
|
589 | changeset: 0:29a4c94f1924 | |||
|
590 | user: User One <user1@example.org> | |||
|
591 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
592 | summary: a | |||
|
593 | ||||
|
594 | $ hg log -u "user3" | |||
|
595 | ||||
|
596 | $ cd .. | |||
|
597 | ||||
|
598 | $ hg init branches | |||
|
599 | $ cd branches | |||
|
600 | ||||
|
601 | $ echo a > a | |||
|
602 | $ hg ci -A -m "commit on default" | |||
|
603 | adding a | |||
|
604 | $ hg branch test | |||
|
605 | marked working directory as branch test | |||
|
606 | $ echo b > b | |||
|
607 | $ hg ci -A -m "commit on test" | |||
|
608 | adding b | |||
|
609 | ||||
|
610 | $ hg up default | |||
|
611 | 0 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
612 | $ echo c > c | |||
|
613 | $ hg ci -A -m "commit on default" | |||
|
614 | adding c | |||
|
615 | $ hg up test | |||
|
616 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |||
|
617 | $ echo c > c | |||
|
618 | $ hg ci -A -m "commit on test" | |||
|
619 | adding c | |||
|
620 | ||||
|
621 | ||||
|
622 | log -b default | |||
|
623 | ||||
|
624 | $ hg log -b default | |||
|
625 | changeset: 2:c3a4f03cc9a7 | |||
|
626 | parent: 0:24427303d56f | |||
|
627 | user: test | |||
|
628 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
629 | summary: commit on default | |||
|
630 | ||||
|
631 | changeset: 0:24427303d56f | |||
|
632 | user: test | |||
|
633 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
634 | summary: commit on default | |||
|
635 | ||||
|
636 | ||||
|
637 | ||||
|
638 | log -b test | |||
|
639 | ||||
|
640 | $ hg log -b test | |||
|
641 | changeset: 3:f5d8de11c2e2 | |||
|
642 | branch: test | |||
|
643 | tag: tip | |||
|
644 | parent: 1:d32277701ccb | |||
|
645 | user: test | |||
|
646 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
647 | summary: commit on test | |||
|
648 | ||||
|
649 | changeset: 1:d32277701ccb | |||
|
650 | branch: test | |||
|
651 | user: test | |||
|
652 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
653 | summary: commit on test | |||
|
654 | ||||
|
655 | ||||
|
656 | ||||
|
657 | log -b dummy | |||
|
658 | ||||
|
659 | $ hg log -b dummy | |||
|
660 | abort: unknown revision 'dummy'! | |||
|
661 | ||||
|
662 | ||||
|
663 | log -b . | |||
|
664 | ||||
|
665 | $ hg log -b . | |||
|
666 | changeset: 3:f5d8de11c2e2 | |||
|
667 | branch: test | |||
|
668 | tag: tip | |||
|
669 | parent: 1:d32277701ccb | |||
|
670 | user: test | |||
|
671 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
672 | summary: commit on test | |||
|
673 | ||||
|
674 | changeset: 1:d32277701ccb | |||
|
675 | branch: test | |||
|
676 | user: test | |||
|
677 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
678 | summary: commit on test | |||
|
679 | ||||
|
680 | ||||
|
681 | ||||
|
682 | log -b default -b test | |||
|
683 | ||||
|
684 | $ hg log -b default -b test | |||
|
685 | changeset: 3:f5d8de11c2e2 | |||
|
686 | branch: test | |||
|
687 | tag: tip | |||
|
688 | parent: 1:d32277701ccb | |||
|
689 | user: test | |||
|
690 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
691 | summary: commit on test | |||
|
692 | ||||
|
693 | changeset: 2:c3a4f03cc9a7 | |||
|
694 | parent: 0:24427303d56f | |||
|
695 | user: test | |||
|
696 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
697 | summary: commit on default | |||
|
698 | ||||
|
699 | changeset: 1:d32277701ccb | |||
|
700 | branch: test | |||
|
701 | user: test | |||
|
702 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
703 | summary: commit on test | |||
|
704 | ||||
|
705 | changeset: 0:24427303d56f | |||
|
706 | user: test | |||
|
707 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
708 | summary: commit on default | |||
|
709 | ||||
|
710 | ||||
|
711 | ||||
|
712 | log -b default -b . | |||
|
713 | ||||
|
714 | $ hg log -b default -b . | |||
|
715 | changeset: 3:f5d8de11c2e2 | |||
|
716 | branch: test | |||
|
717 | tag: tip | |||
|
718 | parent: 1:d32277701ccb | |||
|
719 | user: test | |||
|
720 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
721 | summary: commit on test | |||
|
722 | ||||
|
723 | changeset: 2:c3a4f03cc9a7 | |||
|
724 | parent: 0:24427303d56f | |||
|
725 | user: test | |||
|
726 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
727 | summary: commit on default | |||
|
728 | ||||
|
729 | changeset: 1:d32277701ccb | |||
|
730 | branch: test | |||
|
731 | user: test | |||
|
732 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
733 | summary: commit on test | |||
|
734 | ||||
|
735 | changeset: 0:24427303d56f | |||
|
736 | user: test | |||
|
737 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
738 | summary: commit on default | |||
|
739 | ||||
|
740 | ||||
|
741 | ||||
|
742 | log -b . -b test | |||
|
743 | ||||
|
744 | $ hg log -b . -b test | |||
|
745 | changeset: 3:f5d8de11c2e2 | |||
|
746 | branch: test | |||
|
747 | tag: tip | |||
|
748 | parent: 1:d32277701ccb | |||
|
749 | user: test | |||
|
750 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
751 | summary: commit on test | |||
|
752 | ||||
|
753 | changeset: 1:d32277701ccb | |||
|
754 | branch: test | |||
|
755 | user: test | |||
|
756 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
757 | summary: commit on test | |||
|
758 | ||||
|
759 | ||||
|
760 | ||||
|
761 | log -b 2 | |||
|
762 | ||||
|
763 | $ hg log -b 2 | |||
|
764 | changeset: 2:c3a4f03cc9a7 | |||
|
765 | parent: 0:24427303d56f | |||
|
766 | user: test | |||
|
767 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
768 | summary: commit on default | |||
|
769 | ||||
|
770 | changeset: 0:24427303d56f | |||
|
771 | user: test | |||
|
772 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
773 | summary: commit on default | |||
|
774 | ||||
|
775 | ||||
|
776 | ||||
|
777 | log -p --cwd dir (in subdir) | |||
|
778 | ||||
|
779 | $ mkdir dir | |||
|
780 | $ hg log -p --cwd dir | |||
|
781 | changeset: 3:f5d8de11c2e2 | |||
|
782 | branch: test | |||
|
783 | tag: tip | |||
|
784 | parent: 1:d32277701ccb | |||
|
785 | user: test | |||
|
786 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
787 | summary: commit on test | |||
|
788 | ||||
|
789 | diff -r d32277701ccb -r f5d8de11c2e2 c | |||
|
790 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
791 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 | |||
|
792 | @@ -0,0 +1,1 @@ | |||
|
793 | +c | |||
|
794 | ||||
|
795 | changeset: 2:c3a4f03cc9a7 | |||
|
796 | parent: 0:24427303d56f | |||
|
797 | user: test | |||
|
798 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
799 | summary: commit on default | |||
|
800 | ||||
|
801 | diff -r 24427303d56f -r c3a4f03cc9a7 c | |||
|
802 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
803 | +++ b/c Thu Jan 01 00:00:00 1970 +0000 | |||
|
804 | @@ -0,0 +1,1 @@ | |||
|
805 | +c | |||
|
806 | ||||
|
807 | changeset: 1:d32277701ccb | |||
|
808 | branch: test | |||
|
809 | user: test | |||
|
810 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
811 | summary: commit on test | |||
|
812 | ||||
|
813 | diff -r 24427303d56f -r d32277701ccb b | |||
|
814 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
815 | +++ b/b Thu Jan 01 00:00:00 1970 +0000 | |||
|
816 | @@ -0,0 +1,1 @@ | |||
|
817 | +b | |||
|
818 | ||||
|
819 | changeset: 0:24427303d56f | |||
|
820 | user: test | |||
|
821 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
822 | summary: commit on default | |||
|
823 | ||||
|
824 | diff -r 000000000000 -r 24427303d56f a | |||
|
825 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
826 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |||
|
827 | @@ -0,0 +1,1 @@ | |||
|
828 | +a | |||
|
829 | ||||
|
830 | ||||
|
831 | ||||
|
832 | log -p -R repo | |||
|
833 | ||||
|
834 | $ cd dir | |||
|
835 | $ hg log -p -R .. ../a | |||
|
836 | changeset: 0:24427303d56f | |||
|
837 | user: test | |||
|
838 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
839 | summary: commit on default | |||
|
840 | ||||
|
841 | diff -r 000000000000 -r 24427303d56f a | |||
|
842 | --- /dev/null Thu Jan 01 00:00:00 1970 +0000 | |||
|
843 | +++ b/a Thu Jan 01 00:00:00 1970 +0000 | |||
|
844 | @@ -0,0 +1,1 @@ | |||
|
845 | +a | |||
|
846 | ||||
|
847 | ||||
|
848 | ||||
|
849 | $ cd .. | |||
|
850 | $ hg init follow2 | |||
|
851 | $ cd follow2 | |||
|
852 | ||||
206 |
|
853 | |||
207 | # Build the following history: |
|
854 | # Build the following history: | |
208 | # tip - o - x - o - x - x |
|
855 | # tip - o - x - o - x - x | |
@@ -211,42 +858,161 b' cd follow2' | |||||
211 | # \ / |
|
858 | # \ / | |
212 | # o |
|
859 | # o | |
213 | # |
|
860 | # | |
|
861 | ||||
214 | # Where "o" is a revision containing "foo" and |
|
862 | # Where "o" is a revision containing "foo" and | |
215 | # "x" is a revision without "foo" |
|
863 | # "x" is a revision without "foo" | |
216 | touch init |
|
864 | ||
217 | hg ci -A -m "init, unrelated" |
|
865 | $ touch init | |
218 | echo 'foo' > init |
|
866 | $ hg ci -A -m "init, unrelated" | |
219 | hg ci -m "change, unrelated" |
|
867 | adding init | |
220 |
echo 'foo' > |
|
868 | $ echo 'foo' > init | |
221 |
hg ci - |
|
869 | $ hg ci -m "change, unrelated" | |
222 | hg rm foo |
|
870 | $ echo 'foo' > foo | |
223 |
|
|
871 | $ hg ci -A -m "add unrelated old foo" | |
224 | echo 'related' > foo |
|
872 | adding foo | |
225 | hg ci -A -m "add foo, related" |
|
873 | $ hg rm foo | |
|
874 | $ hg ci -m "delete foo, unrelated" | |||
|
875 | $ echo 'related' > foo | |||
|
876 | $ hg ci -A -m "add foo, related" | |||
|
877 | adding foo | |||
226 |
|
878 | |||
227 | hg up 0 |
|
879 | $ hg up 0 | |
228 | touch branch |
|
880 | 1 files updated, 0 files merged, 1 files removed, 0 files unresolved | |
229 | hg ci -A -m "first branch, unrelated" |
|
881 | $ touch branch | |
230 | touch foo |
|
882 | $ hg ci -A -m "first branch, unrelated" | |
231 | hg ci -A -m "create foo, related" |
|
883 | adding branch | |
232 | echo 'change' > foo |
|
884 | created new head | |
233 | hg ci -m "change foo, related" |
|
885 | $ touch foo | |
|
886 | $ hg ci -A -m "create foo, related" | |||
|
887 | adding foo | |||
|
888 | $ echo 'change' > foo | |||
|
889 | $ hg ci -m "change foo, related" | |||
|
890 | ||||
|
891 | $ hg up 6 | |||
|
892 | 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |||
|
893 | $ echo 'change foo in branch' > foo | |||
|
894 | $ hg ci -m "change foo in branch, related" | |||
|
895 | created new head | |||
|
896 | $ hg merge 7 | |||
|
897 | merging foo | |||
|
898 | warning: conflicts during merge. | |||
|
899 | merging foo failed! | |||
|
900 | 0 files updated, 0 files merged, 0 files removed, 1 files unresolved | |||
|
901 | use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | |||
|
902 | $ echo 'merge 1' > foo | |||
|
903 | $ hg resolve -m foo | |||
|
904 | $ hg ci -m "First merge, related" | |||
|
905 | ||||
|
906 | $ hg merge 4 | |||
|
907 | merging foo | |||
|
908 | warning: conflicts during merge. | |||
|
909 | merging foo failed! | |||
|
910 | 1 files updated, 0 files merged, 0 files removed, 1 files unresolved | |||
|
911 | use 'hg resolve' to retry unresolved file merges or 'hg update -C' to abandon | |||
|
912 | $ echo 'merge 2' > foo | |||
|
913 | $ hg resolve -m foo | |||
|
914 | $ hg ci -m "Last merge, related" | |||
234 |
|
915 | |||
235 | hg up 6 |
|
916 | $ hg --config "extensions.graphlog=" glog | |
236 | echo 'change foo in branch' > foo |
|
917 | @ changeset: 10:4dae8563d2c5 | |
237 | hg ci -m "change foo in branch, related" |
|
918 | |\ tag: tip | |
238 | hg merge 7 |
|
919 | | | parent: 9:7b35701b003e | |
239 | echo 'merge 1' > foo |
|
920 | | | parent: 4:88176d361b69 | |
240 | hg resolve -m foo |
|
921 | | | user: test | |
241 | hg ci -m "First merge, related" |
|
922 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |
|
923 | | | summary: Last merge, related | |||
|
924 | | | | |||
|
925 | | o changeset: 9:7b35701b003e | |||
|
926 | | |\ parent: 8:e5416ad8a855 | |||
|
927 | | | | parent: 7:87fe3144dcfa | |||
|
928 | | | | user: test | |||
|
929 | | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
930 | | | | summary: First merge, related | |||
|
931 | | | | | |||
|
932 | | | o changeset: 8:e5416ad8a855 | |||
|
933 | | | | parent: 6:dc6c325fe5ee | |||
|
934 | | | | user: test | |||
|
935 | | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
936 | | | | summary: change foo in branch, related | |||
|
937 | | | | | |||
|
938 | | o | changeset: 7:87fe3144dcfa | |||
|
939 | | |/ user: test | |||
|
940 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
941 | | | summary: change foo, related | |||
|
942 | | | | |||
|
943 | | o changeset: 6:dc6c325fe5ee | |||
|
944 | | | user: test | |||
|
945 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
946 | | | summary: create foo, related | |||
|
947 | | | | |||
|
948 | | o changeset: 5:73db34516eb9 | |||
|
949 | | | parent: 0:e87515fd044a | |||
|
950 | | | user: test | |||
|
951 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
952 | | | summary: first branch, unrelated | |||
|
953 | | | | |||
|
954 | o | changeset: 4:88176d361b69 | |||
|
955 | | | user: test | |||
|
956 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
957 | | | summary: add foo, related | |||
|
958 | | | | |||
|
959 | o | changeset: 3:dd78ae4afb56 | |||
|
960 | | | user: test | |||
|
961 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
962 | | | summary: delete foo, unrelated | |||
|
963 | | | | |||
|
964 | o | changeset: 2:c4c64aedf0f7 | |||
|
965 | | | user: test | |||
|
966 | | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
967 | | | summary: add unrelated old foo | |||
|
968 | | | | |||
|
969 | o | changeset: 1:e5faa7440653 | |||
|
970 | |/ user: test | |||
|
971 | | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
972 | | summary: change, unrelated | |||
|
973 | | | |||
|
974 | o changeset: 0:e87515fd044a | |||
|
975 | user: test | |||
|
976 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
977 | summary: init, unrelated | |||
|
978 | ||||
242 |
|
979 | |||
243 | hg merge 4 |
|
980 | $ hg --traceback log -f foo | |
244 | echo 'merge 2' > foo |
|
981 | changeset: 10:4dae8563d2c5 | |
245 | hg resolve -m foo |
|
982 | tag: tip | |
246 | hg ci -m "Last merge, related" |
|
983 | parent: 9:7b35701b003e | |
|
984 | parent: 4:88176d361b69 | |||
|
985 | user: test | |||
|
986 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
987 | summary: Last merge, related | |||
|
988 | ||||
|
989 | changeset: 9:7b35701b003e | |||
|
990 | parent: 8:e5416ad8a855 | |||
|
991 | parent: 7:87fe3144dcfa | |||
|
992 | user: test | |||
|
993 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
994 | summary: First merge, related | |||
|
995 | ||||
|
996 | changeset: 8:e5416ad8a855 | |||
|
997 | parent: 6:dc6c325fe5ee | |||
|
998 | user: test | |||
|
999 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1000 | summary: change foo in branch, related | |||
|
1001 | ||||
|
1002 | changeset: 7:87fe3144dcfa | |||
|
1003 | user: test | |||
|
1004 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1005 | summary: change foo, related | |||
|
1006 | ||||
|
1007 | changeset: 6:dc6c325fe5ee | |||
|
1008 | user: test | |||
|
1009 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1010 | summary: create foo, related | |||
|
1011 | ||||
|
1012 | changeset: 4:88176d361b69 | |||
|
1013 | user: test | |||
|
1014 | date: Thu Jan 01 00:00:00 1970 +0000 | |||
|
1015 | summary: add foo, related | |||
|
1016 | ||||
247 |
|
1017 | |||
248 | hg --config "extensions.graphlog=" glog |
|
1018 | $ exit 0 | |
249 |
|
||||
250 | hg --traceback log -f foo |
|
|||
251 |
|
||||
252 | exit 0 |
|
General Comments 0
You need to be logged in to leave comments.
Login now