| author | Patrick Mezard <pmezard@gmail.com> |
| Thu, 25 Oct 2007 00:09:13 +0200 | |
| changeset 5491 | f00ed7c5877b |
| parent 4510 | e0bc2c575044 |
| child 5811 | 180a3eee4b75 |
| permissions | -rw-r--r-- |
|
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
1 |
adding a |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
2 |
changeset: 0:8580ff50825a |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
3 |
user: test |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
4 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
5 |
summary: a |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
6 |
|
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
7 |
% -f, directory |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
8 |
abort: can only follow copies/renames for explicit file names |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
9 |
% -f, but no args |
|
3837
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
10 |
changeset: 4:b30c444c7c84 |
|
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
11 |
tag: tip |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
12 |
user: test |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
13 |
date: Thu Jan 01 00:00:05 1970 +0000 |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
14 |
summary: e |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
15 |
|
|
3837
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
16 |
changeset: 3:16b60bf3f99a |
|
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
17 |
user: test |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
18 |
date: Thu Jan 01 00:00:04 1970 +0000 |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
19 |
summary: d |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
20 |
|
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
21 |
changeset: 2:21fba396af4c |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
22 |
user: test |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
23 |
date: Thu Jan 01 00:00:03 1970 +0000 |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
24 |
summary: c |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
25 |
|
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
26 |
changeset: 1:c0296dabce9b |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
27 |
user: test |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
28 |
date: Thu Jan 01 00:00:02 1970 +0000 |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
29 |
summary: b |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
30 |
|
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
31 |
changeset: 0:8580ff50825a |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
32 |
user: test |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
33 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
34 |
summary: a |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
35 |
|
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
36 |
% one rename |
|
2966
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2901
diff
changeset
|
37 |
changeset: 0:8580ff50825a |
|
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
38 |
user: test |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
39 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
40 |
files: a |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
41 |
description: |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
42 |
a |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
43 |
|
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
44 |
|
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
45 |
% many renames |
|
3837
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
46 |
changeset: 4:b30c444c7c84 |
|
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
47 |
tag: tip |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
48 |
user: test |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
49 |
date: Thu Jan 01 00:00:05 1970 +0000 |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
50 |
files: dir/b e |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
51 |
description: |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
52 |
e |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
53 |
|
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
54 |
|
|
2966
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2901
diff
changeset
|
55 |
changeset: 2:21fba396af4c |
|
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
56 |
user: test |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
57 |
date: Thu Jan 01 00:00:03 1970 +0000 |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
58 |
files: b dir/b |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
59 |
description: |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
60 |
c |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
61 |
|
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
62 |
|
|
2966
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2901
diff
changeset
|
63 |
changeset: 1:c0296dabce9b |
|
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
64 |
user: test |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
65 |
date: Thu Jan 01 00:00:02 1970 +0000 |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
66 |
files: b |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
67 |
description: |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
68 |
b |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
69 |
|
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
70 |
|
|
2966
fb493241d7f6
Only show long hashes with --debug, not --verbose
Matt Mackall <mpm@selenic.com>
parents:
2901
diff
changeset
|
71 |
changeset: 0:8580ff50825a |
|
2741
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
72 |
user: test |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
73 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
74 |
files: a |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
75 |
description: |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
76 |
a |
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
77 |
|
|
ae5ce3454ef5
log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff
changeset
|
78 |
|
| 3197 | 79 |
% log copies |
80 |
4 e (dir/b) |
|
81 |
3 b (a) |
|
82 |
2 dir/b (b) |
|
83 |
1 b (a) |
|
84 |
0 |
|
|
3383
c7c6f1a45348
Test case for log --copies on non-linear manifests (issue391)
Brendan Cully <brendan@kublai.com>
parents:
3197
diff
changeset
|
85 |
% log copies, non-linear manifest |
|
c7c6f1a45348
Test case for log --copies on non-linear manifests (issue391)
Brendan Cully <brendan@kublai.com>
parents:
3197
diff
changeset
|
86 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
c7c6f1a45348
Test case for log --copies on non-linear manifests (issue391)
Brendan Cully <brendan@kublai.com>
parents:
3197
diff
changeset
|
87 |
adding foo |
|
c7c6f1a45348
Test case for log --copies on non-linear manifests (issue391)
Brendan Cully <brendan@kublai.com>
parents:
3197
diff
changeset
|
88 |
5 e (dir/b) |
|
3837
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
89 |
% log -p d |
|
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
90 |
changeset: 3:16b60bf3f99a |
|
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
91 |
user: test |
|
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
92 |
date: Thu Jan 01 00:00:04 1970 +0000 |
|
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
93 |
files: a b d |
|
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
94 |
description: |
|
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
95 |
d |
|
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
96 |
|
|
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
97 |
|
|
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
98 |
diff -r 21fba396af4c -r 16b60bf3f99a d |
|
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
99 |
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 |
|
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
100 |
+++ b/d Thu Jan 01 00:00:04 1970 +0000 |
|
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
101 |
@@ -0,0 +1,1 @@ |
|
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
102 |
+a |
|
7df171ea50cd
Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents:
3718
diff
changeset
|
103 |
|
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
104 |
adding base |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
105 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
106 |
adding b1 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
107 |
% log -f |
|
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
108 |
changeset: 3:e62f78d544b4 |
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
109 |
tag: tip |
|
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
110 |
parent: 1:3d5bf5654eda |
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
111 |
user: test |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
112 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
113 |
summary: b1 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
114 |
|
|
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
115 |
changeset: 1:3d5bf5654eda |
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
116 |
user: test |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
117 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
118 |
summary: r1 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
119 |
|
|
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
120 |
changeset: 0:67e992f2c4f3 |
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
121 |
user: test |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
122 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
123 |
summary: base |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
124 |
|
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
125 |
1 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
126 |
adding b2 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
127 |
% log -f -r 1:tip |
|
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
128 |
changeset: 1:3d5bf5654eda |
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
129 |
user: test |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
130 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
131 |
summary: r1 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
132 |
|
|
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
133 |
changeset: 2:60c670bf5b30 |
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
134 |
user: test |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
135 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
136 |
summary: r2 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
137 |
|
|
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
138 |
changeset: 3:e62f78d544b4 |
|
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
139 |
parent: 1:3d5bf5654eda |
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
140 |
user: test |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
141 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
142 |
summary: b1 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
143 |
|
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
144 |
2 files updated, 0 files merged, 1 files removed, 0 files unresolved |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
145 |
1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
146 |
(branch merge, don't forget to commit) |
|
4510
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
147 |
% log -r . with two parents |
|
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
148 |
warning: working directory has two parents, tag '.' uses the first |
|
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
149 |
changeset: 3:e62f78d544b4 |
|
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
150 |
parent: 1:3d5bf5654eda |
|
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
151 |
user: test |
|
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
152 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
153 |
summary: b1 |
|
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
154 |
|
|
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
155 |
% log -r . with one parent |
|
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
156 |
changeset: 5:302e9dd6890d |
|
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
157 |
tag: tip |
|
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
158 |
parent: 3:e62f78d544b4 |
|
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
159 |
parent: 4:ddb82e70d1a1 |
|
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
160 |
user: test |
|
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
161 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
162 |
summary: m12 |
|
e0bc2c575044
Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4180
diff
changeset
|
163 |
|
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
164 |
% log --follow-first |
|
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
165 |
changeset: 6:2404bbcab562 |
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
166 |
tag: tip |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
167 |
user: test |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
168 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
169 |
summary: b1.1 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
170 |
|
|
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
171 |
changeset: 5:302e9dd6890d |
|
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
172 |
parent: 3:e62f78d544b4 |
|
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
173 |
parent: 4:ddb82e70d1a1 |
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
174 |
user: test |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
175 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
176 |
summary: m12 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
177 |
|
|
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
178 |
changeset: 3:e62f78d544b4 |
|
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
179 |
parent: 1:3d5bf5654eda |
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
180 |
user: test |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
181 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
182 |
summary: b1 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
183 |
|
|
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
184 |
changeset: 1:3d5bf5654eda |
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
185 |
user: test |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
186 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
187 |
summary: r1 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
188 |
|
|
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
189 |
changeset: 0:67e992f2c4f3 |
|
2785
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
190 |
user: test |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
191 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
192 |
summary: base |
|
e7f70588af30
Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents:
2741
diff
changeset
|
193 |
|
| 2901 | 194 |
% log -P 2 |
|
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
195 |
changeset: 6:2404bbcab562 |
| 2901 | 196 |
tag: tip |
197 |
user: test |
|
198 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
199 |
summary: b1.1 |
|
200 |
||
|
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
201 |
changeset: 5:302e9dd6890d |
|
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
202 |
parent: 3:e62f78d544b4 |
|
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
203 |
parent: 4:ddb82e70d1a1 |
| 2901 | 204 |
user: test |
205 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
206 |
summary: m12 |
|
207 |
||
|
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
208 |
changeset: 4:ddb82e70d1a1 |
|
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
209 |
parent: 0:67e992f2c4f3 |
| 2901 | 210 |
user: test |
211 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
212 |
summary: b2 |
|
213 |
||
|
4180
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
214 |
changeset: 3:e62f78d544b4 |
|
f80cf8b7bbd9
Remove dummy branch hack from tests
Matt Mackall <mpm@selenic.com>
parents:
4167
diff
changeset
|
215 |
parent: 1:3d5bf5654eda |
| 2901 | 216 |
user: test |
217 |
date: Thu Jan 01 00:00:01 1970 +0000 |
|
218 |
summary: b1 |
|
219 |
||
|
3718
7db88b094b14
fix hg log -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3383
diff
changeset
|
220 |
% log -r "" |
|
7db88b094b14
fix hg log -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
3383
diff
changeset
|
221 |
abort: Ambiguous identifier! |