annotate tests/test-log.t @ 12388:75f044d4dbf5

minirst: Support for admonitions The old asciidoc format supported something like this, this is why there is NOTE: scattered here and there.
author Erik Zielke <ez@aragost.com>
date Wed, 22 Sep 2010 15:51:59 +0200
parents f1e8d6f6e682
children 4fee1fd3de9a
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1 $ hg init a
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
2
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
3 $ cd a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
4 $ echo a > a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
5 $ hg ci -Ama -d '1 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
6 adding a
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
7
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
8 $ hg cp a b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
9 $ hg ci -mb -d '2 0'
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
10
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
11 $ mkdir dir
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
12 $ hg mv b dir
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
13 $ hg ci -mc -d '3 0'
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
14
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
15 $ hg mv a b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
16 $ echo a > d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
17 $ hg add d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
18 $ hg ci -md -d '4 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
19
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
20 $ hg mv dir/b e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
21 $ hg ci -me -d '5 0'
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
22
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
23 $ hg log a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
24 changeset: 0:8580ff50825a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
25 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
26 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
27 summary: a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
28
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
29
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
30 -f, directory
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
31
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
32 $ hg log -f dir
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
33 abort: cannot follow nonexistent file: "dir"
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
34 [255]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
35
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
36 -f, but no args
2741
ae5ce3454ef5 log: add -f/--follow option, to follow rename/copy
Vadim Gelfer <vadim.gelfer@gmail.com>
parents:
diff changeset
37
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
38 $ hg log -f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
39 changeset: 4:66c1345dc4f9
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
40 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
41 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
42 date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
43 summary: e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
44
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
45 changeset: 3:7c6c671bb7cc
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
46 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
47 date: Thu Jan 01 00:00:04 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
48 summary: d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
49
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
50 changeset: 2:41dd4284081e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
51 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
52 date: Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
53 summary: c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
54
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
55 changeset: 1:784de7cef101
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
56 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
57 date: Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
58 summary: b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
59
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
60 changeset: 0:8580ff50825a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
61 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
62 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
63 summary: a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
64
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
65
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
66 one rename
11562
efbc09fdefd8 test-log: Add test for "hg log -pf" (issue647)
Joel Rosdahl <joel@rosdahl.net>
parents: 11509
diff changeset
67
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
68 $ hg log -vf a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
69 changeset: 0:8580ff50825a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
70 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
71 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
72 files: a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
73 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
74 a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
75
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
76
3197
e18c3d08528d Show copies in hg log.
Brendan Cully <brendan@kublai.com>
parents: 2901
diff changeset
77
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
78 many renames
10776
08870cf7d388 Fix default style so 'log --copies' has a start and an end.
Greg Ward <greg-hg@gerg.ca>
parents: 10061
diff changeset
79
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
80 $ hg log -vf e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
81 changeset: 4:66c1345dc4f9
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
82 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
83 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
84 date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
85 files: dir/b e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
86 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
87 e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
88
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
89
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
90 changeset: 2:41dd4284081e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
91 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
92 date: Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
93 files: b dir/b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
94 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
95 c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
96
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
97
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
98 changeset: 1:784de7cef101
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
99 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
100 date: Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
101 files: b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
102 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
103 b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
104
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
105
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
106 changeset: 0:8580ff50825a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
107 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
108 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
109 files: a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
110 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
111 a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
112
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
113
5811
180a3eee4b75 Fix copies reporting in log and convert.
Maxim Dounin <mdounin@mdounin.ru>
parents: 4510
diff changeset
114
3837
7df171ea50cd Fix log regression where log -p file showed diffs for other files
Matt Mackall <mpm@selenic.com>
parents: 3718
diff changeset
115
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
116 log -pf dir/b
4510
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
117
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
118 $ hg log -pf dir/b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
119 changeset: 2:41dd4284081e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
120 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
121 date: Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
122 summary: c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
123
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
124 diff -r 784de7cef101 -r 41dd4284081e dir/b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
125 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
126 +++ b/dir/b Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
127 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
128 +a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
129
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
130 changeset: 1:784de7cef101
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
131 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
132 date: Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
133 summary: b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
134
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
135 diff -r 8580ff50825a -r 784de7cef101 b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
136 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
137 +++ b/b Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
138 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
139 +a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
140
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
141 changeset: 0:8580ff50825a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
142 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
143 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
144 summary: a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
145
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
146 diff -r 000000000000 -r 8580ff50825a a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
147 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
148 +++ b/a Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
149 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
150 +a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
151
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
152
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
153 log -vf dir/b
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
154
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
155 $ hg log -vf dir/b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
156 changeset: 2:41dd4284081e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
157 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
158 date: Thu Jan 01 00:00:03 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
159 files: b dir/b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
160 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
161 c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
162
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
163
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
164 changeset: 1:784de7cef101
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
165 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
166 date: Thu Jan 01 00:00:02 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
167 files: b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
168 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
169 b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
170
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
171
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
172 changeset: 0:8580ff50825a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
173 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
174 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
175 files: a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
176 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
177 a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
178
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
179
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
180
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
181
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
182 log copies with --copies
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
183
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
184 $ hg log -vC --template '{rev} {file_copies}\n'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
185 4 e (dir/b)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
186 3 b (a)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
187 2 dir/b (b)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
188 1 b (a)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
189 0
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
190
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
191 log copies switch without --copies, with old filecopy template
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
192
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
193 $ hg log -v --template '{rev} {file_copies_switch%filecopy}\n'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
194 4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
195 3
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
196 2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
197 1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
198 0
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
199
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
200 log copies switch with --copies
4510
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
201
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
202 $ hg log -vC --template '{rev} {file_copies_switch}\n'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
203 4 e (dir/b)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
204 3 b (a)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
205 2 dir/b (b)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
206 1 b (a)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
207 0
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
208
4510
e0bc2c575044 Issue a warning if "-r ." is used with two working directory parents.
Thomas Arendsen Hein <thomas@intevation.de>
parents: 4180
diff changeset
209
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
210 log copies with hardcoded style and with --style=default
2785
e7f70588af30 Test suite for log --follow and --follow-first.
Brendan Cully <brendan@kublai.com>
parents: 2741
diff changeset
211
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
212 $ hg log -vC -r4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
213 changeset: 4:66c1345dc4f9
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
214 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
215 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
216 date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
217 files: dir/b e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
218 copies: e (dir/b)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
219 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
220 e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
221
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
222
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
223 $ hg log -vC -r4 --style=default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
224 changeset: 4:66c1345dc4f9
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
225 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
226 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
227 date: Thu Jan 01 00:00:05 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
228 files: dir/b e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
229 copies: e (dir/b)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
230 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
231 e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
232
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
233
3718
7db88b094b14 fix hg log -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3383
diff changeset
234
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
235
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
236 log copies, non-linear manifest
7762
fece056bf240 add --git option to commands supporting --patch (log, incoming, history, tip)
Jim Correia <jim.correia@pobox.com>
parents: 7062
diff changeset
237
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
238 $ hg up -C 3
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
239 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
240 $ hg mv dir/b e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
241 $ echo foo > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
242 $ hg ci -Ame2 -d '6 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
243 adding foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
244 created new head
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
245 $ hg log -v --template '{rev} {file_copies}\n' -r 5
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
246 5 e (dir/b)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
247
3718
7db88b094b14 fix hg log -r ''
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents: 3383
diff changeset
248
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
249 log copies, execute bit set
9373
b34184c046ac log: fix traceback for log -k caused by 1ef630452e0b (issue1805)
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents: 8020
diff changeset
250
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
251 $ chmod +x e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
252 $ hg ci -me3 -d '7 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
253 $ hg log -v --template '{rev} {file_copies}\n' -r 6
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
254 6
9421
c8e4dc218aaf log: prevent negative date range from displaying entire log (issue1805)
Christian Ebert <blacktrash@gmx.net>
parents: 9373
diff changeset
255
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
256
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
257 log -p d
10826
717c35d55fb3 color: colorize based on output labels instead of parsing output
Brodie Rao <brodie@bitheap.org>
parents: 10776
diff changeset
258
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
259 $ hg log -pv d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
260 changeset: 3:7c6c671bb7cc
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
261 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
262 date: Thu Jan 01 00:00:04 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
263 files: a b d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
264 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
265 d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
266
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
267
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
268 diff -r 41dd4284081e -r 7c6c671bb7cc d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
269 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
270 +++ b/d Thu Jan 01 00:00:04 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
271 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
272 +a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
273
11061
51d0387523c6 log: add --stat for diffstat output
Yuya Nishihara <yuya@tcha.org>
parents: 10960
diff changeset
274
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
275
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
276 log --removed file
8020
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
277
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
278 $ hg log --removed -v a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
279 changeset: 3:7c6c671bb7cc
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
280 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
281 date: Thu Jan 01 00:00:04 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
282 files: a b d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
283 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
284 d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
285
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
286
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
287 changeset: 0:8580ff50825a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
288 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
289 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
290 files: a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
291 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
292 a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
293
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
294
8020
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
295
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
296 log --removed revrange file
8020
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
297
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
298 $ hg log --removed -v -r0:2 a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
299 changeset: 0:8580ff50825a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
300 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
301 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
302 files: a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
303 description:
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
304 a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
305
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
306
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
307
8020
777a9efdae2d log: fix broken multiple user search
Henrik Stuart <hg@hstuart.dk>
parents: 7762
diff changeset
308
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
309 log --follow tests
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
310
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
311 $ hg init ../follow
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
312 $ cd ../follow
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
313
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
314 $ echo base > base
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
315 $ hg ci -Ambase -d '1 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
316 adding base
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
317
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
318 $ echo r1 >> base
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
319 $ hg ci -Amr1 -d '1 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
320 $ echo r2 >> base
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
321 $ hg ci -Amr2 -d '1 0'
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
322
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
323 $ hg up -C 1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
324 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
325 $ echo b1 > b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
326 $ hg ci -Amb1 -d '1 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
327 adding b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
328 created new head
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
329
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
330
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
331 log -f
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
332
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
333 $ hg log -f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
334 changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
335 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
336 parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
337 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
338 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
339 summary: b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
340
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
341 changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
342 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
343 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
344 summary: r1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
345
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
346 changeset: 0:67e992f2c4f3
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
347 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
348 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
349 summary: base
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
350
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
351
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
352
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
353 log -f -r 1:tip
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
354
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
355 $ hg up -C 0
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
356 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
357 $ echo b2 > b2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
358 $ hg ci -Amb2 -d '1 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
359 adding b2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
360 created new head
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
361 $ hg log -f -r 1:tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
362 changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
363 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
364 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
365 summary: r1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
366
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
367 changeset: 2:60c670bf5b30
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
368 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
369 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
370 summary: r2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
371
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
372 changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
373 parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
374 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
375 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
376 summary: b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
377
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
378
10960
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
379
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
380 log -r . with two parents
10957
0d5f139b23c1 commands: Add 'hg log --branch' and deprecate 'hg log --only-branch'
Steve Losh <steve@stevelosh.com>
parents: 10826
diff changeset
381
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
382 $ hg up -C 3
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
383 2 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
384 $ hg merge tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
385 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
386 (branch merge, don't forget to commit)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
387 $ hg log -r .
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
388 changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
389 parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
390 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
391 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
392 summary: b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
393
10960
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
394
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
395
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
396 log -r . with one parent
10960
ca739acf1a98 commands: add more robust support for 'hg log -b' (issue2078)
Steve Losh <steve@stevelosh.com>
parents: 10957
diff changeset
397
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
398 $ hg ci -mm12 -d '1 0'
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
399 $ hg log -r .
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
400 changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
401 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
402 parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
403 parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
404 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
405 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
406 summary: m12
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
407
11508
fbab0875fd09 log: fix missing diff output for hg log -p in sub directory
Yuya Nishihara <yuya@tcha.org>
parents: 11141
diff changeset
408
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
409 $ echo postm >> b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
410 $ hg ci -Amb1.1 -d'1 0'
11509
2eaaad99f2f0 test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents: 11508
diff changeset
411
2eaaad99f2f0 test-log: also test "log -p -R" case
Martin Geisler <mg@lazybytes.net>
parents: 11508
diff changeset
412
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
413 log --follow-first
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
414
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
415 $ hg log --follow-first
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
416 changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
417 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
418 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
419 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
420 summary: b1.1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
421
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
422 changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
423 parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
424 parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
425 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
426 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
427 summary: m12
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
428
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
429 changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
430 parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
431 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
432 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
433 summary: b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
434
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
435 changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
436 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
437 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
438 summary: r1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
439
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
440 changeset: 0:67e992f2c4f3
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
441 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
442 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
443 summary: base
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
444
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
445
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
446
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
447 log -P 2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
448
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
449 $ hg log -P 2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
450 changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
451 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
452 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
453 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
454 summary: b1.1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
455
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
456 changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
457 parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
458 parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
459 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
460 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
461 summary: m12
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
462
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
463 changeset: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
464 parent: 0:67e992f2c4f3
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
465 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
466 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
467 summary: b2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
468
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
469 changeset: 3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
470 parent: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
471 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
472 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
473 summary: b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
474
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
475
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
476
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
477 log -r tip -p --git
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
478
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
479 $ hg log -r tip -p --git
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
480 changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
481 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
482 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
483 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
484 summary: b1.1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
485
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
486 diff --git a/b1 b/b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
487 --- a/b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
488 +++ b/b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
489 @@ -1,1 +1,2 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
490 b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
491 +postm
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
492
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
493
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
494
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
495 log -r ""
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
496
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
497 $ hg log -r ''
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
498 hg: parse error: empty query
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
499 [255]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
500
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
501 log -r <some unknown node id>
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
502
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
503 $ hg log -r 1000000000000000000000000000000000000000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
504 abort: unknown revision '1000000000000000000000000000000000000000'!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
505 [255]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
506
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
507 log -k r1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
508
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
509 $ hg log -k r1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
510 changeset: 1:3d5bf5654eda
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
511 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
512 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
513 summary: r1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
514
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
515
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
516
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
517 log -d -1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
518
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
519 $ hg log -d -1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
520
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
521
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
522 log -p -l2 --color=always
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
523
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
524 $ hg --config extensions.color= --config color.mode=ansi \
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
525 > log -p -l2 --color=always
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
526 changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
527 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
528 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
529 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
530 summary: b1.1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
531
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
532 diff -r 302e9dd6890d -r 2404bbcab562 b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
533 --- a/b1 Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
534 +++ b/b1 Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
535 @@ -1,1 +1,2 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
536 b1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
537 +postm
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
538
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
539 changeset: 5:302e9dd6890d
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
540 parent: 3:e62f78d544b4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
541 parent: 4:ddb82e70d1a1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
542 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
543 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
544 summary: m12
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
545
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
546 diff -r e62f78d544b4 -r 302e9dd6890d b2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
547 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
548 +++ b/b2 Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
549 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
550 +b2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
551
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
552
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
553
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
554 log -r tip --stat
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
555
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
556 $ hg log -r tip --stat
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
557 changeset: 6:2404bbcab562
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
558 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
559 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
560 date: Thu Jan 01 00:00:01 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
561 summary: b1.1
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
562
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
563 b1 | 1 +
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
564 1 files changed, 1 insertions(+), 0 deletions(-)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
565
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
566
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
567 $ cd ..
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
568
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
569 $ hg init usertest
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
570 $ cd usertest
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
571
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
572 $ echo a > a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
573 $ hg ci -A -m "a" -u "User One <user1@example.org>"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
574 adding a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
575 $ echo b > b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
576 $ hg ci -A -m "b" -u "User Two <user2@example.org>"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
577 adding b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
578
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
579 $ hg log -u "User One <user1@example.org>"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
580 changeset: 0:29a4c94f1924
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
581 user: User One <user1@example.org>
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
582 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
583 summary: a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
584
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
585 $ hg log -u "user1" -u "user2"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
586 changeset: 1:e834b5e69c0e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
587 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
588 user: User Two <user2@example.org>
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
589 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
590 summary: b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
591
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
592 changeset: 0:29a4c94f1924
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
593 user: User One <user1@example.org>
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
594 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
595 summary: a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
596
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
597 $ hg log -u "user3"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
598
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
599 $ cd ..
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
600
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
601 $ hg init branches
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
602 $ cd branches
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
603
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
604 $ echo a > a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
605 $ hg ci -A -m "commit on default"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
606 adding a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
607 $ hg branch test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
608 marked working directory as branch test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
609 $ echo b > b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
610 $ hg ci -A -m "commit on test"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
611 adding b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
612
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
613 $ hg up default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
614 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
615 $ echo c > c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
616 $ hg ci -A -m "commit on default"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
617 adding c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
618 $ hg up test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
619 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
620 $ echo c > c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
621 $ hg ci -A -m "commit on test"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
622 adding c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
623
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
624
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
625 log -b default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
626
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
627 $ hg log -b default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
628 changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
629 parent: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
630 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
631 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
632 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
633
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
634 changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
635 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
636 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
637 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
638
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
639
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
640
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
641 log -b test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
642
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
643 $ hg log -b test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
644 changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
645 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
646 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
647 parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
648 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
649 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
650 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
651
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
652 changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
653 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
654 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
655 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
656 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
657
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
658
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
659
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
660 log -b dummy
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
661
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
662 $ hg log -b dummy
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
663 abort: unknown revision 'dummy'!
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
664 [255]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
665
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
666
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
667 log -b .
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
668
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
669 $ hg log -b .
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
670 changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
671 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
672 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
673 parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
674 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
675 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
676 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
677
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
678 changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
679 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
680 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
681 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
682 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
683
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
684
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
685
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
686 log -b default -b test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
687
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
688 $ hg log -b default -b test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
689 changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
690 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
691 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
692 parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
693 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
694 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
695 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
696
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
697 changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
698 parent: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
699 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
700 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
701 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
702
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
703 changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
704 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
705 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
706 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
707 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
708
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
709 changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
710 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
711 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
712 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
713
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
714
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
715
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
716 log -b default -b .
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
717
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
718 $ hg log -b default -b .
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
719 changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
720 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
721 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
722 parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
723 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
724 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
725 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
726
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
727 changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
728 parent: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
729 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
730 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
731 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
732
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
733 changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
734 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
735 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
736 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
737 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
738
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
739 changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
740 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
741 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
742 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
743
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
744
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
745
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
746 log -b . -b test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
747
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
748 $ hg log -b . -b test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
749 changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
750 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
751 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
752 parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
753 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
754 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
755 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
756
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
757 changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
758 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
759 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
760 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
761 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
762
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
763
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
764
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
765 log -b 2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
766
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
767 $ hg log -b 2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
768 changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
769 parent: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
770 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
771 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
772 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
773
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
774 changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
775 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
776 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
777 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
778
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
779
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
780
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
781 log -p --cwd dir (in subdir)
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
782
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
783 $ mkdir dir
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
784 $ hg log -p --cwd dir
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
785 changeset: 3:f5d8de11c2e2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
786 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
787 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
788 parent: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
789 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
790 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
791 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
792
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
793 diff -r d32277701ccb -r f5d8de11c2e2 c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
794 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
795 +++ b/c Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
796 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
797 +c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
798
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
799 changeset: 2:c3a4f03cc9a7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
800 parent: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
801 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
802 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
803 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
804
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
805 diff -r 24427303d56f -r c3a4f03cc9a7 c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
806 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
807 +++ b/c Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
808 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
809 +c
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
810
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
811 changeset: 1:d32277701ccb
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
812 branch: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
813 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
814 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
815 summary: commit on test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
816
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
817 diff -r 24427303d56f -r d32277701ccb b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
818 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
819 +++ b/b Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
820 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
821 +b
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
822
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
823 changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
824 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
825 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
826 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
827
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
828 diff -r 000000000000 -r 24427303d56f a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
829 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
830 +++ b/a Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
831 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
832 +a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
833
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
834
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
835
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
836 log -p -R repo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
837
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
838 $ cd dir
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
839 $ hg log -p -R .. ../a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
840 changeset: 0:24427303d56f
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
841 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
842 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
843 summary: commit on default
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
844
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
845 diff -r 000000000000 -r 24427303d56f a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
846 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
847 +++ b/a Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
848 @@ -0,0 +1,1 @@
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
849 +a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
850
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
851
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
852
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
853 $ cd ..
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
854 $ hg init follow2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
855 $ cd follow2
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
856
11899
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
857
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
858 # Build the following history:
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
859 # tip - o - x - o - x - x
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
860 # \ /
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
861 # o - o - o - x
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
862 # \ /
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
863 # o
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
864 #
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
865 # Where "o" is a revision containing "foo" and
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
866 # "x" is a revision without "foo"
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
867
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
868 $ touch init
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
869 $ hg ci -A -m "init, unrelated"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
870 adding init
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
871 $ echo 'foo' > init
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
872 $ hg ci -m "change, unrelated"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
873 $ echo 'foo' > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
874 $ hg ci -A -m "add unrelated old foo"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
875 adding foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
876 $ hg rm foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
877 $ hg ci -m "delete foo, unrelated"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
878 $ echo 'related' > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
879 $ hg ci -A -m "add foo, related"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
880 adding foo
11899
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
881
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
882 $ hg up 0
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
883 1 files updated, 0 files merged, 1 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
884 $ touch branch
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
885 $ hg ci -A -m "first branch, unrelated"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
886 adding branch
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
887 created new head
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
888 $ touch foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
889 $ hg ci -A -m "create foo, related"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
890 adding foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
891 $ echo 'change' > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
892 $ hg ci -m "change foo, related"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
893
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
894 $ hg up 6
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
895 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
896 $ echo 'change foo in branch' > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
897 $ hg ci -m "change foo in branch, related"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
898 created new head
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
899 $ hg merge 7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
900 merging foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
901 warning: conflicts during merge.
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
902 merging foo failed!
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
903 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
12314
f2daa6ab514a merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Brodie Rao <brodie@bitheap.org>
parents: 11900
diff changeset
904 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
905 [1]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
906 $ echo 'merge 1' > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
907 $ hg resolve -m foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
908 $ hg ci -m "First merge, related"
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
909
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
910 $ hg merge 4
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
911 merging foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
912 warning: conflicts during merge.
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
913 merging foo failed!
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
914 1 files updated, 0 files merged, 0 files removed, 1 files unresolved
12314
f2daa6ab514a merge: suggest 'hg up -C .' for discarding changes, not 'hg up -C'
Brodie Rao <brodie@bitheap.org>
parents: 11900
diff changeset
915 use 'hg resolve' to retry unresolved file merges or 'hg update -C .' to abandon
12316
4134686b83e1 tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents: 12314
diff changeset
916 [1]
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
917 $ echo 'merge 2' > foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
918 $ hg resolve -m foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
919 $ hg ci -m "Last merge, related"
11899
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
920
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
921 $ hg --config "extensions.graphlog=" glog
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
922 @ changeset: 10:4dae8563d2c5
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
923 |\ tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
924 | | parent: 9:7b35701b003e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
925 | | parent: 4:88176d361b69
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
926 | | user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
927 | | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
928 | | summary: Last merge, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
929 | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
930 | o changeset: 9:7b35701b003e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
931 | |\ parent: 8:e5416ad8a855
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
932 | | | parent: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
933 | | | user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
934 | | | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
935 | | | summary: First merge, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
936 | | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
937 | | o changeset: 8:e5416ad8a855
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
938 | | | parent: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
939 | | | user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
940 | | | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
941 | | | summary: change foo in branch, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
942 | | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
943 | o | changeset: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
944 | |/ user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
945 | | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
946 | | summary: change foo, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
947 | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
948 | o changeset: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
949 | | user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
950 | | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
951 | | summary: create foo, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
952 | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
953 | o changeset: 5:73db34516eb9
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
954 | | parent: 0:e87515fd044a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
955 | | user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
956 | | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
957 | | summary: first branch, unrelated
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
958 | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
959 o | changeset: 4:88176d361b69
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
960 | | user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
961 | | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
962 | | summary: add foo, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
963 | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
964 o | changeset: 3:dd78ae4afb56
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
965 | | user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
966 | | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
967 | | summary: delete foo, unrelated
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
968 | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
969 o | changeset: 2:c4c64aedf0f7
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
970 | | user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
971 | | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
972 | | summary: add unrelated old foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
973 | |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
974 o | changeset: 1:e5faa7440653
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
975 |/ user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
976 | date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
977 | summary: change, unrelated
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
978 |
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
979 o changeset: 0:e87515fd044a
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
980 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
981 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
982 summary: init, unrelated
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
983
11899
99cafcae25d9 log: do not --follow file that is deleted and recreated later (issue732)
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11631
diff changeset
984
11900
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
985 $ hg --traceback log -f foo
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
986 changeset: 10:4dae8563d2c5
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
987 tag: tip
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
988 parent: 9:7b35701b003e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
989 parent: 4:88176d361b69
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
990 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
991 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
992 summary: Last merge, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
993
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
994 changeset: 9:7b35701b003e
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
995 parent: 8:e5416ad8a855
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
996 parent: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
997 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
998 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
999 summary: First merge, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1001 changeset: 8:e5416ad8a855
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1002 parent: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1003 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1004 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1005 summary: change foo in branch, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1006
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1007 changeset: 7:87fe3144dcfa
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1008 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1009 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1010 summary: change foo, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1011
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1012 changeset: 6:dc6c325fe5ee
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1013 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1014 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1015 summary: create foo, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1016
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1017 changeset: 4:88176d361b69
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1018 user: test
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1019 date: Thu Jan 01 00:00:00 1970 +0000
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1020 summary: add foo, related
cd7182358d9f tests: unify test-log
Nicolas Dumazet <nicdumz.commits@gmail.com>
parents: 11899
diff changeset
1021
12383
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1022
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1023 Test from/for issue2383
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1024
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1025 $ hg init issue2383
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1026 $ cd issue2383
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1027
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1028 Create a test repo:
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1029
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1030 $ echo a > a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1031 $ hg ci -Am0
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1032 adding a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1033 $ echo b > b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1034 $ hg ci -Am1
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1035 adding b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1036 $ hg co 0
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1037 0 files updated, 0 files merged, 1 files removed, 0 files unresolved
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1038 $ echo b > a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1039 $ hg ci -m2
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1040 created new head
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1041
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1042 Merge:
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1043
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1044 $ hg merge
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1045 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1046 (branch merge, don't forget to commit)
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1047
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1048 Make sure there's a file listed in the merge to trigger the bug:
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1049
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1050 $ echo c > a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1051 $ hg ci -m3
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1052
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1053 Two files shown here in diff:
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1054
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1055 $ hg diff --rev 2:3
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1056 diff -r b09be438c43a -r 8e07aafe1edc a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1057 --- a/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1058 +++ b/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1059 @@ -1,1 +1,1 @@
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1060 -b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1061 +c
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1062 diff -r b09be438c43a -r 8e07aafe1edc b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1063 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1064 +++ b/b Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1065 @@ -0,0 +1,1 @@
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1066 +b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1067
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1068 Diff here should be the same:
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1069
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1070 $ hg log -vpr 3
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1071 changeset: 3:8e07aafe1edc
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1072 tag: tip
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1073 parent: 2:b09be438c43a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1074 parent: 1:925d80f479bb
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1075 user: test
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1076 date: Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1077 files: a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1078 description:
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1079 3
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1080
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1081
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1082 diff -r b09be438c43a -r 8e07aafe1edc a
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1083 --- a/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1084 +++ b/a Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1085 @@ -1,1 +1,1 @@
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1086 -b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1087 +c
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1088 diff -r b09be438c43a -r 8e07aafe1edc b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1089 --- /dev/null Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1090 +++ b/b Thu Jan 01 00:00:00 1970 +0000
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1091 @@ -0,0 +1,1 @@
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1092 +b
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1093
f1e8d6f6e682 merge with stable
Mads Kiilerich <mads@kiilerich.com>
parents: 12382 12328
diff changeset
1094 $ cd ..