comparison tests/test-glog.out @ 8397:613ac2856535

remove deprecated rawcommit
author Matt Mackall <mpm@selenic.com>
date Thu, 14 May 2009 13:20:40 -0500
parents f6cee47c0907
children d12e9b40e444
comparison
equal deleted inserted replaced
8396:d7a77ad9bcce 8397:613ac2856535
1 % init 1 % init
2 % empty repo 2 % empty repo
3 % building tree 3 % building tree
4 (the rawcommit command is deprecated)
5 (the rawcommit command is deprecated)
6 (the rawcommit command is deprecated)
7 (the rawcommit command is deprecated)
8 (the rawcommit command is deprecated)
9 (the rawcommit command is deprecated)
10 (the rawcommit command is deprecated)
11 (the rawcommit command is deprecated)
12 (the rawcommit command is deprecated)
13 (the rawcommit command is deprecated)
14 (the rawcommit command is deprecated)
15 (the rawcommit command is deprecated)
16 (the rawcommit command is deprecated)
17 (the rawcommit command is deprecated)
18 (the rawcommit command is deprecated)
19 (the rawcommit command is deprecated)
20 (the rawcommit command is deprecated)
21 (the rawcommit command is deprecated)
22 (the rawcommit command is deprecated)
23 (the rawcommit command is deprecated)
24 (the rawcommit command is deprecated)
25 (the rawcommit command is deprecated)
26 (the rawcommit command is deprecated)
27 (the rawcommit command is deprecated)
28 (the rawcommit command is deprecated)
29 (the rawcommit command is deprecated)
30 (the rawcommit command is deprecated)
31 (the rawcommit command is deprecated)
32 (the rawcommit command is deprecated)
33 (the rawcommit command is deprecated)
34 (the rawcommit command is deprecated)
35 (the rawcommit command is deprecated)
36 (the rawcommit command is deprecated)
37 (the rawcommit command is deprecated)
38 (the rawcommit command is deprecated)
39 % glog -q 4 % glog -q
40 @ 34:0eed7cd895e0 5 @ 34:fea3ac5810e0
41 | 6 |
42 | o 33:2e9d1b521374 7 | o 33:68608f5145f9
43 | | 8 | |
44 o | 32:77f7d8438a3c 9 o | 32:d06dffa21a31
45 |\ \ 10 |\ \
46 | o \ 31:82ee55204a79 11 | o \ 31:621d83e11f67
47 | |\ \ 12 | |\ \
48 | | o \ 30:777dfc428649 13 | | o \ 30:6e11cd4b648f
49 | | |\ \ 14 | | |\ \
50 | | | o | 29:f8e7fee63353 15 | | | o | 29:cd9bb2be7593
51 | | | | | 16 | | | | |
52 | | o | | 28:4b6e9bd48cf9 17 | | o | | 28:44ecd0b9ae99
53 | | |\ \ \ 18 | | |\ \ \
54 o | | | | | 27:e9e08174cd30 19 o | | | | | 27:886ed638191b
55 |/ / / / / 20 |/ / / / /
56 | | o---+ 26:720dc079a855 21 | | o---+ 26:7f25b6c2f0b9
57 | | | | | 22 | | | | |
58 +---o | | 25:9d4ed048d013 23 +---o | | 25:91da8ed57247
59 | | | | | 24 | | | | |
60 | | o | | 24:4a68967db00d 25 | | o | | 24:a9c19a3d96b7
61 | | |\| | 26 | | |\| |
62 | | o | | 23:bc31393cabdf 27 | | o | | 23:a01cddf0766d
63 | |/| | | 28 | |/| | |
64 +---o---+ 22:a37f2ea6ebc6 29 +---o---+ 22:e0d9cccacb5d
65 | | / / 30 | | / /
66 o | | | 21:e758e8f4ace9 31 o | | | 21:d42a756af44d
67 |\ \ \ \ 32 |\ \ \ \
68 | o---+-+ 20:aeccadad74b4 33 | o---+-+ 20:d30ed6450e32
69 | / / / 34 | / / /
70 o | | | 19:138069b5dad7 35 o | | | 19:31ddc2c1573b
71 |\ \ \ \ 36 |\ \ \ \
72 +---+---o 18:5a8c9a29ef81 37 +---+---o 18:1aa84d96232a
73 | | | | 38 | | | |
74 | o | | 17:43e52b935494 39 | o | | 17:44765d7c06e0
75 | |\ \ \ 40 | |\ \ \
76 | | o---+ 16:449a2f9562a4 41 | | o---+ 16:3677d192927d
77 | | |/ / 42 | | |/ /
78 o | | | 15:c0b4283d4c1d 43 o | | | 15:1dda3f72782d
79 |\ \ \ \ 44 |\ \ \ \
80 | o-----+ 14:9d533950abf0 45 | o-----+ 14:8eac370358ef
81 | |/ / / 46 | |/ / /
82 o | | | 13:c39d0a2b8165 47 o | | | 13:22d8966a97e3
83 |\ \ \ \ 48 |\ \ \ \
84 +---o | | 12:74dc7aea4494 49 +---o | | 12:86b91144a6e9
85 | | |/ / 50 | | |/ /
86 | o | | 11:c3c395dd8b98 51 | o | | 11:832d76e6bdf2
87 | |\ \ \ 52 | |\ \ \
88 | | o---+ 10:8094c50149ef 53 | | o---+ 10:74c64d036d72
89 | |/ / / 54 | |/ / /
90 o | | | 9:79ab1812f961 55 o | | | 9:7010c0af0a35
91 |\ \ \ \ 56 |\ \ \ \
92 | o-----+ 8:d7aa38594334 57 | o-----+ 8:7a0b11f71937
93 |/ / / / 58 |/ / / /
94 o | | | 7:699392d1259e 59 o | | | 7:b632bb1b1224
95 |\ \ \ \ 60 |\ \ \ \
96 +---o | | 6:0ca7c061cf45 61 +---o | | 6:b105a072e251
97 | |/ / / 62 | |/ / /
98 | o | | 5:3589c3c477ab 63 | o | | 5:4409d547b708
99 | |\ \ \ 64 | |\ \ \
100 | | o | | 4:e2cad8233c77 65 | | o | | 4:26a8bac39d9f
101 | |/|/ / 66 | |/|/ /
102 | o / / 3:02173ffbf857 67 | o / / 3:27eef8ed80b4
103 |/ / / 68 |/ / /
104 o / / 2:e8ea2256f9ec 69 o / / 2:3d9a33b8d1e1
105 |/ / 70 |/ /
106 o / 1:3cae7826a707 71 o / 1:6db2ef61d156
107 |/ 72 |/
108 o 0:7aa22e58e8c1 73 o 0:e6eb3150255d
109 74
110 % glog 75 % glog
111 @ changeset: 34:0eed7cd895e0 76 @ changeset: 34:fea3ac5810e0
112 | tag: tip 77 | tag: tip
113 | parent: 32:77f7d8438a3c 78 | parent: 32:d06dffa21a31
114 | user: test 79 | user: test
115 | date: Thu Jan 01 00:00:34 1970 +0000 80 | date: Thu Jan 01 00:00:34 1970 +0000
116 | summary: (34) head 81 | summary: (34) head
117 | 82 |
118 | o changeset: 33:2e9d1b521374 83 | o changeset: 33:68608f5145f9
119 | | parent: 18:5a8c9a29ef81 84 | | parent: 18:1aa84d96232a
120 | | user: test 85 | | user: test
121 | | date: Thu Jan 01 00:00:33 1970 +0000 86 | | date: Thu Jan 01 00:00:33 1970 +0000
122 | | summary: (33) head 87 | | summary: (33) head
123 | | 88 | |
124 o | changeset: 32:77f7d8438a3c 89 o | changeset: 32:d06dffa21a31
125 |\ \ parent: 27:e9e08174cd30 90 |\ \ parent: 27:886ed638191b
126 | | | parent: 31:82ee55204a79 91 | | | parent: 31:621d83e11f67
127 | | | user: test 92 | | | user: test
128 | | | date: Thu Jan 01 00:00:32 1970 +0000 93 | | | date: Thu Jan 01 00:00:32 1970 +0000
129 | | | summary: (32) expand 94 | | | summary: (32) expand
130 | | | 95 | | |
131 | o | changeset: 31:82ee55204a79 96 | o | changeset: 31:621d83e11f67
132 | |\ \ parent: 21:e758e8f4ace9 97 | |\ \ parent: 21:d42a756af44d
133 | | | | parent: 30:777dfc428649 98 | | | | parent: 30:6e11cd4b648f
134 | | | | user: test 99 | | | | user: test
135 | | | | date: Thu Jan 01 00:00:31 1970 +0000 100 | | | | date: Thu Jan 01 00:00:31 1970 +0000
136 | | | | summary: (31) expand 101 | | | | summary: (31) expand
137 | | | | 102 | | | |
138 | | o | changeset: 30:777dfc428649 103 | | o | changeset: 30:6e11cd4b648f
139 | | |\ \ parent: 28:4b6e9bd48cf9 104 | | |\ \ parent: 28:44ecd0b9ae99
140 | | | | | parent: 29:f8e7fee63353 105 | | | | | parent: 29:cd9bb2be7593
141 | | | | | user: test 106 | | | | | user: test
142 | | | | | date: Thu Jan 01 00:00:30 1970 +0000 107 | | | | | date: Thu Jan 01 00:00:30 1970 +0000
143 | | | | | summary: (30) expand 108 | | | | | summary: (30) expand
144 | | | | | 109 | | | | |
145 | | | o | changeset: 29:f8e7fee63353 110 | | | o | changeset: 29:cd9bb2be7593
146 | | | | | parent: 0:7aa22e58e8c1 111 | | | | | parent: 0:e6eb3150255d
147 | | | | | user: test 112 | | | | | user: test
148 | | | | | date: Thu Jan 01 00:00:29 1970 +0000 113 | | | | | date: Thu Jan 01 00:00:29 1970 +0000
149 | | | | | summary: (29) regular commit 114 | | | | | summary: (29) regular commit
150 | | | | | 115 | | | | |
151 | | o | | changeset: 28:4b6e9bd48cf9 116 | | o | | changeset: 28:44ecd0b9ae99
152 | | |\ \ \ parent: 1:3cae7826a707 117 | | |\ \ \ parent: 1:6db2ef61d156
153 | | | | | | parent: 26:720dc079a855 118 | | | | | | parent: 26:7f25b6c2f0b9
154 | | | | | | user: test 119 | | | | | | user: test
155 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 120 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000
156 | | | | | | summary: (28) merge zero known 121 | | | | | | summary: (28) merge zero known
157 | | | | | | 122 | | | | | |
158 o | | | | | changeset: 27:e9e08174cd30 123 o | | | | | changeset: 27:886ed638191b
159 |/ / / / / parent: 21:e758e8f4ace9 124 |/ / / / / parent: 21:d42a756af44d
160 | | | | | user: test 125 | | | | | user: test
161 | | | | | date: Thu Jan 01 00:00:27 1970 +0000 126 | | | | | date: Thu Jan 01 00:00:27 1970 +0000
162 | | | | | summary: (27) collapse 127 | | | | | summary: (27) collapse
163 | | | | | 128 | | | | |
164 | | o---+ changeset: 26:720dc079a855 129 | | o---+ changeset: 26:7f25b6c2f0b9
165 | | | | | parent: 18:5a8c9a29ef81 130 | | | | | parent: 18:1aa84d96232a
166 | | | | | parent: 25:9d4ed048d013 131 | | | | | parent: 25:91da8ed57247
167 | | | | | user: test 132 | | | | | user: test
168 | | | | | date: Thu Jan 01 00:00:26 1970 +0000 133 | | | | | date: Thu Jan 01 00:00:26 1970 +0000
169 | | | | | summary: (26) merge one known; far right 134 | | | | | summary: (26) merge one known; far right
170 | | | | | 135 | | | | |
171 +---o | | changeset: 25:9d4ed048d013 136 +---o | | changeset: 25:91da8ed57247
172 | | | | | parent: 21:e758e8f4ace9 137 | | | | | parent: 21:d42a756af44d
173 | | | | | parent: 24:4a68967db00d 138 | | | | | parent: 24:a9c19a3d96b7
174 | | | | | user: test 139 | | | | | user: test
175 | | | | | date: Thu Jan 01 00:00:25 1970 +0000 140 | | | | | date: Thu Jan 01 00:00:25 1970 +0000
176 | | | | | summary: (25) merge one known; far left 141 | | | | | summary: (25) merge one known; far left
177 | | | | | 142 | | | | |
178 | | o | | changeset: 24:4a68967db00d 143 | | o | | changeset: 24:a9c19a3d96b7
179 | | |\| | parent: 0:7aa22e58e8c1 144 | | |\| | parent: 0:e6eb3150255d
180 | | | | | parent: 23:bc31393cabdf 145 | | | | | parent: 23:a01cddf0766d
181 | | | | | user: test 146 | | | | | user: test
182 | | | | | date: Thu Jan 01 00:00:24 1970 +0000 147 | | | | | date: Thu Jan 01 00:00:24 1970 +0000
183 | | | | | summary: (24) merge one known; immediate right 148 | | | | | summary: (24) merge one known; immediate right
184 | | | | | 149 | | | | |
185 | | o | | changeset: 23:bc31393cabdf 150 | | o | | changeset: 23:a01cddf0766d
186 | |/| | | parent: 1:3cae7826a707 151 | |/| | | parent: 1:6db2ef61d156
187 | | | | | parent: 22:a37f2ea6ebc6 152 | | | | | parent: 22:e0d9cccacb5d
188 | | | | | user: test 153 | | | | | user: test
189 | | | | | date: Thu Jan 01 00:00:23 1970 +0000 154 | | | | | date: Thu Jan 01 00:00:23 1970 +0000
190 | | | | | summary: (23) merge one known; immediate left 155 | | | | | summary: (23) merge one known; immediate left
191 | | | | | 156 | | | | |
192 +---o---+ changeset: 22:a37f2ea6ebc6 157 +---o---+ changeset: 22:e0d9cccacb5d
193 | | | | parent: 18:5a8c9a29ef81 158 | | | | parent: 18:1aa84d96232a
194 | | / / parent: 21:e758e8f4ace9 159 | | / / parent: 21:d42a756af44d
195 | | | | user: test 160 | | | | user: test
196 | | | | date: Thu Jan 01 00:00:22 1970 +0000 161 | | | | date: Thu Jan 01 00:00:22 1970 +0000
197 | | | | summary: (22) merge two known; one far left, one far right 162 | | | | summary: (22) merge two known; one far left, one far right
198 | | | | 163 | | | |
199 o | | | changeset: 21:e758e8f4ace9 164 o | | | changeset: 21:d42a756af44d
200 |\ \ \ \ parent: 19:138069b5dad7 165 |\ \ \ \ parent: 19:31ddc2c1573b
201 | | | | | parent: 20:aeccadad74b4 166 | | | | | parent: 20:d30ed6450e32
202 | | | | | user: test 167 | | | | | user: test
203 | | | | | date: Thu Jan 01 00:00:21 1970 +0000 168 | | | | | date: Thu Jan 01 00:00:21 1970 +0000
204 | | | | | summary: (21) expand 169 | | | | | summary: (21) expand
205 | | | | | 170 | | | | |
206 | o---+-+ changeset: 20:aeccadad74b4 171 | o---+-+ changeset: 20:d30ed6450e32
207 | | | | parent: 0:7aa22e58e8c1 172 | | | | parent: 0:e6eb3150255d
208 | / / / parent: 18:5a8c9a29ef81 173 | / / / parent: 18:1aa84d96232a
209 | | | | user: test 174 | | | | user: test
210 | | | | date: Thu Jan 01 00:00:20 1970 +0000 175 | | | | date: Thu Jan 01 00:00:20 1970 +0000
211 | | | | summary: (20) merge two known; two far right 176 | | | | summary: (20) merge two known; two far right
212 | | | | 177 | | | |
213 o | | | changeset: 19:138069b5dad7 178 o | | | changeset: 19:31ddc2c1573b
214 |\ \ \ \ parent: 15:c0b4283d4c1d 179 |\ \ \ \ parent: 15:1dda3f72782d
215 | | | | | parent: 17:43e52b935494 180 | | | | | parent: 17:44765d7c06e0
216 | | | | | user: test 181 | | | | | user: test
217 | | | | | date: Thu Jan 01 00:00:19 1970 +0000 182 | | | | | date: Thu Jan 01 00:00:19 1970 +0000
218 | | | | | summary: (19) expand 183 | | | | | summary: (19) expand
219 | | | | | 184 | | | | |
220 +---+---o changeset: 18:5a8c9a29ef81 185 +---+---o changeset: 18:1aa84d96232a
221 | | | | parent: 1:3cae7826a707 186 | | | | parent: 1:6db2ef61d156
222 | | | | parent: 15:c0b4283d4c1d 187 | | | | parent: 15:1dda3f72782d
223 | | | | user: test 188 | | | | user: test
224 | | | | date: Thu Jan 01 00:00:18 1970 +0000 189 | | | | date: Thu Jan 01 00:00:18 1970 +0000
225 | | | | summary: (18) merge two known; two far left 190 | | | | summary: (18) merge two known; two far left
226 | | | | 191 | | | |
227 | o | | changeset: 17:43e52b935494 192 | o | | changeset: 17:44765d7c06e0
228 | |\ \ \ parent: 12:74dc7aea4494 193 | |\ \ \ parent: 12:86b91144a6e9
229 | | | | | parent: 16:449a2f9562a4 194 | | | | | parent: 16:3677d192927d
230 | | | | | user: test 195 | | | | | user: test
231 | | | | | date: Thu Jan 01 00:00:17 1970 +0000 196 | | | | | date: Thu Jan 01 00:00:17 1970 +0000
232 | | | | | summary: (17) expand 197 | | | | | summary: (17) expand
233 | | | | | 198 | | | | |
234 | | o---+ changeset: 16:449a2f9562a4 199 | | o---+ changeset: 16:3677d192927d
235 | | | | | parent: 0:7aa22e58e8c1 200 | | | | | parent: 0:e6eb3150255d
236 | | |/ / parent: 1:3cae7826a707 201 | | |/ / parent: 1:6db2ef61d156
237 | | | | user: test 202 | | | | user: test
238 | | | | date: Thu Jan 01 00:00:16 1970 +0000 203 | | | | date: Thu Jan 01 00:00:16 1970 +0000
239 | | | | summary: (16) merge two known; one immediate right, one near right 204 | | | | summary: (16) merge two known; one immediate right, one near right
240 | | | | 205 | | | |
241 o | | | changeset: 15:c0b4283d4c1d 206 o | | | changeset: 15:1dda3f72782d
242 |\ \ \ \ parent: 13:c39d0a2b8165 207 |\ \ \ \ parent: 13:22d8966a97e3
243 | | | | | parent: 14:9d533950abf0 208 | | | | | parent: 14:8eac370358ef
244 | | | | | user: test 209 | | | | | user: test
245 | | | | | date: Thu Jan 01 00:00:15 1970 +0000 210 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
246 | | | | | summary: (15) expand 211 | | | | | summary: (15) expand
247 | | | | | 212 | | | | |
248 | o-----+ changeset: 14:9d533950abf0 213 | o-----+ changeset: 14:8eac370358ef
249 | | | | | parent: 0:7aa22e58e8c1 214 | | | | | parent: 0:e6eb3150255d
250 | |/ / / parent: 12:74dc7aea4494 215 | |/ / / parent: 12:86b91144a6e9
251 | | | | user: test 216 | | | | user: test
252 | | | | date: Thu Jan 01 00:00:14 1970 +0000 217 | | | | date: Thu Jan 01 00:00:14 1970 +0000
253 | | | | summary: (14) merge two known; one immediate right, one far right 218 | | | | summary: (14) merge two known; one immediate right, one far right
254 | | | | 219 | | | |
255 o | | | changeset: 13:c39d0a2b8165 220 o | | | changeset: 13:22d8966a97e3
256 |\ \ \ \ parent: 9:79ab1812f961 221 |\ \ \ \ parent: 9:7010c0af0a35
257 | | | | | parent: 11:c3c395dd8b98 222 | | | | | parent: 11:832d76e6bdf2
258 | | | | | user: test 223 | | | | | user: test
259 | | | | | date: Thu Jan 01 00:00:13 1970 +0000 224 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
260 | | | | | summary: (13) expand 225 | | | | | summary: (13) expand
261 | | | | | 226 | | | | |
262 +---o | | changeset: 12:74dc7aea4494 227 +---o | | changeset: 12:86b91144a6e9
263 | | |/ / parent: 1:3cae7826a707 228 | | |/ / parent: 1:6db2ef61d156
264 | | | | parent: 9:79ab1812f961 229 | | | | parent: 9:7010c0af0a35
265 | | | | user: test 230 | | | | user: test
266 | | | | date: Thu Jan 01 00:00:12 1970 +0000 231 | | | | date: Thu Jan 01 00:00:12 1970 +0000
267 | | | | summary: (12) merge two known; one immediate right, one far left 232 | | | | summary: (12) merge two known; one immediate right, one far left
268 | | | | 233 | | | |
269 | o | | changeset: 11:c3c395dd8b98 234 | o | | changeset: 11:832d76e6bdf2
270 | |\ \ \ parent: 6:0ca7c061cf45 235 | |\ \ \ parent: 6:b105a072e251
271 | | | | | parent: 10:8094c50149ef 236 | | | | | parent: 10:74c64d036d72
272 | | | | | user: test 237 | | | | | user: test
273 | | | | | date: Thu Jan 01 00:00:11 1970 +0000 238 | | | | | date: Thu Jan 01 00:00:11 1970 +0000
274 | | | | | summary: (11) expand 239 | | | | | summary: (11) expand
275 | | | | | 240 | | | | |
276 | | o---+ changeset: 10:8094c50149ef 241 | | o---+ changeset: 10:74c64d036d72
277 | | | | | parent: 0:7aa22e58e8c1 242 | | | | | parent: 0:e6eb3150255d
278 | |/ / / parent: 6:0ca7c061cf45 243 | |/ / / parent: 6:b105a072e251
279 | | | | user: test 244 | | | | user: test
280 | | | | date: Thu Jan 01 00:00:10 1970 +0000 245 | | | | date: Thu Jan 01 00:00:10 1970 +0000
281 | | | | summary: (10) merge two known; one immediate left, one near right 246 | | | | summary: (10) merge two known; one immediate left, one near right
282 | | | | 247 | | | |
283 o | | | changeset: 9:79ab1812f961 248 o | | | changeset: 9:7010c0af0a35
284 |\ \ \ \ parent: 7:699392d1259e 249 |\ \ \ \ parent: 7:b632bb1b1224
285 | | | | | parent: 8:d7aa38594334 250 | | | | | parent: 8:7a0b11f71937
286 | | | | | user: test 251 | | | | | user: test
287 | | | | | date: Thu Jan 01 00:00:09 1970 +0000 252 | | | | | date: Thu Jan 01 00:00:09 1970 +0000
288 | | | | | summary: (9) expand 253 | | | | | summary: (9) expand
289 | | | | | 254 | | | | |
290 | o-----+ changeset: 8:d7aa38594334 255 | o-----+ changeset: 8:7a0b11f71937
291 | | | | | parent: 0:7aa22e58e8c1 256 | | | | | parent: 0:e6eb3150255d
292 |/ / / / parent: 7:699392d1259e 257 |/ / / / parent: 7:b632bb1b1224
293 | | | | user: test 258 | | | | user: test
294 | | | | date: Thu Jan 01 00:00:08 1970 +0000 259 | | | | date: Thu Jan 01 00:00:08 1970 +0000
295 | | | | summary: (8) merge two known; one immediate left, one far right 260 | | | | summary: (8) merge two known; one immediate left, one far right
296 | | | | 261 | | | |
297 o | | | changeset: 7:699392d1259e 262 o | | | changeset: 7:b632bb1b1224
298 |\ \ \ \ parent: 2:e8ea2256f9ec 263 |\ \ \ \ parent: 2:3d9a33b8d1e1
299 | | | | | parent: 5:3589c3c477ab 264 | | | | | parent: 5:4409d547b708
300 | | | | | user: test 265 | | | | | user: test
301 | | | | | date: Thu Jan 01 00:00:07 1970 +0000 266 | | | | | date: Thu Jan 01 00:00:07 1970 +0000
302 | | | | | summary: (7) expand 267 | | | | | summary: (7) expand
303 | | | | | 268 | | | | |
304 +---o | | changeset: 6:0ca7c061cf45 269 +---o | | changeset: 6:b105a072e251
305 | |/ / / parent: 2:e8ea2256f9ec 270 | |/ / / parent: 2:3d9a33b8d1e1
306 | | | | parent: 5:3589c3c477ab 271 | | | | parent: 5:4409d547b708
307 | | | | user: test 272 | | | | user: test
308 | | | | date: Thu Jan 01 00:00:06 1970 +0000 273 | | | | date: Thu Jan 01 00:00:06 1970 +0000
309 | | | | summary: (6) merge two known; one immediate left, one far left 274 | | | | summary: (6) merge two known; one immediate left, one far left
310 | | | | 275 | | | |
311 | o | | changeset: 5:3589c3c477ab 276 | o | | changeset: 5:4409d547b708
312 | |\ \ \ parent: 3:02173ffbf857 277 | |\ \ \ parent: 3:27eef8ed80b4
313 | | | | | parent: 4:e2cad8233c77 278 | | | | | parent: 4:26a8bac39d9f
314 | | | | | user: test 279 | | | | | user: test
315 | | | | | date: Thu Jan 01 00:00:05 1970 +0000 280 | | | | | date: Thu Jan 01 00:00:05 1970 +0000
316 | | | | | summary: (5) expand 281 | | | | | summary: (5) expand
317 | | | | | 282 | | | | |
318 | | o | | changeset: 4:e2cad8233c77 283 | | o | | changeset: 4:26a8bac39d9f
319 | |/|/ / parent: 1:3cae7826a707 284 | |/|/ / parent: 1:6db2ef61d156
320 | | | | parent: 3:02173ffbf857 285 | | | | parent: 3:27eef8ed80b4
321 | | | | user: test 286 | | | | user: test
322 | | | | date: Thu Jan 01 00:00:04 1970 +0000 287 | | | | date: Thu Jan 01 00:00:04 1970 +0000
323 | | | | summary: (4) merge two known; one immediate left, one immediate right 288 | | | | summary: (4) merge two known; one immediate left, one immediate right
324 | | | | 289 | | | |
325 | o | | changeset: 3:02173ffbf857 290 | o | | changeset: 3:27eef8ed80b4
326 |/ / / user: test 291 |/ / / user: test
327 | | | date: Thu Jan 01 00:00:03 1970 +0000 292 | | | date: Thu Jan 01 00:00:03 1970 +0000
328 | | | summary: (3) collapse 293 | | | summary: (3) collapse
329 | | | 294 | | |
330 o | | changeset: 2:e8ea2256f9ec 295 o | | changeset: 2:3d9a33b8d1e1
331 |/ / user: test 296 |/ / user: test
332 | | date: Thu Jan 01 00:00:02 1970 +0000 297 | | date: Thu Jan 01 00:00:02 1970 +0000
333 | | summary: (2) collapse 298 | | summary: (2) collapse
334 | | 299 | |
335 o | changeset: 1:3cae7826a707 300 o | changeset: 1:6db2ef61d156
336 |/ user: test 301 |/ user: test
337 | date: Thu Jan 01 00:00:01 1970 +0000 302 | date: Thu Jan 01 00:00:01 1970 +0000
338 | summary: (1) collapse 303 | summary: (1) collapse
339 | 304 |
340 o changeset: 0:7aa22e58e8c1 305 o changeset: 0:e6eb3150255d
341 user: test 306 user: test
342 date: Thu Jan 01 00:00:00 1970 +0000 307 date: Thu Jan 01 00:00:00 1970 +0000
343 summary: (0) root 308 summary: (0) root
344 309
345 % file glog 310 % file glog
346 o changeset: 5:3589c3c477ab 311 @ changeset: 34:fea3ac5810e0
347 parent: 3:02173ffbf857 312 | tag: tip
348 parent: 4:e2cad8233c77 313 | parent: 32:d06dffa21a31
314 | user: test
315 | date: Thu Jan 01 00:00:34 1970 +0000
316 | summary: (34) head
317 |
318 | o changeset: 33:68608f5145f9
319 | | parent: 18:1aa84d96232a
320 | | user: test
321 | | date: Thu Jan 01 00:00:33 1970 +0000
322 | | summary: (33) head
323 | |
324 o | changeset: 32:d06dffa21a31
325 |\ \ parent: 27:886ed638191b
326 | | | parent: 31:621d83e11f67
327 | | | user: test
328 | | | date: Thu Jan 01 00:00:32 1970 +0000
329 | | | summary: (32) expand
330 | | |
331 | o | changeset: 31:621d83e11f67
332 | | | parent: 21:d42a756af44d
333 | | | parent: 30:6e11cd4b648f
334 | | | user: test
335 | | | date: Thu Jan 01 00:00:31 1970 +0000
336 | | | summary: (31) expand
337 | | |
338 | o | changeset: 30:6e11cd4b648f
339 | |\ \ parent: 28:44ecd0b9ae99
340 | | | | parent: 29:cd9bb2be7593
341 | | | | user: test
342 | | | | date: Thu Jan 01 00:00:30 1970 +0000
343 | | | | summary: (30) expand
344 | | | |
345 | | o | changeset: 29:cd9bb2be7593
346 | | | | parent: 0:e6eb3150255d
347 | | | | user: test
348 | | | | date: Thu Jan 01 00:00:29 1970 +0000
349 | | | | summary: (29) regular commit
350 | | | |
351 | o | | changeset: 28:44ecd0b9ae99
352 | | | | parent: 1:6db2ef61d156
353 | | | | parent: 26:7f25b6c2f0b9
354 | | | | user: test
355 | | | | date: Thu Jan 01 00:00:28 1970 +0000
356 | | | | summary: (28) merge zero known
357 | | | |
358 o | | | changeset: 27:886ed638191b
359 | | | | parent: 21:d42a756af44d
360 | | | | user: test
361 | | | | date: Thu Jan 01 00:00:27 1970 +0000
362 | | | | summary: (27) collapse
363 | | | |
364 | o | | changeset: 26:7f25b6c2f0b9
365 | | | | parent: 18:1aa84d96232a
366 | | | | parent: 25:91da8ed57247
367 | | | | user: test
368 | | | | date: Thu Jan 01 00:00:26 1970 +0000
369 | | | | summary: (26) merge one known; far right
370 | | | |
371 | o | | changeset: 25:91da8ed57247
372 | | | | parent: 21:d42a756af44d
373 | | | | parent: 24:a9c19a3d96b7
374 | | | | user: test
375 | | | | date: Thu Jan 01 00:00:25 1970 +0000
376 | | | | summary: (25) merge one known; far left
377 | | | |
378 | o | | changeset: 24:a9c19a3d96b7
379 | | | | parent: 0:e6eb3150255d
380 | | | | parent: 23:a01cddf0766d
381 | | | | user: test
382 | | | | date: Thu Jan 01 00:00:24 1970 +0000
383 | | | | summary: (24) merge one known; immediate right
384 | | | |
385 | o | | changeset: 23:a01cddf0766d
386 | | | | parent: 1:6db2ef61d156
387 | | | | parent: 22:e0d9cccacb5d
388 | | | | user: test
389 | | | | date: Thu Jan 01 00:00:23 1970 +0000
390 | | | | summary: (23) merge one known; immediate left
391 | | | |
392 | o | | changeset: 22:e0d9cccacb5d
393 |/ / / parent: 18:1aa84d96232a
394 | | | parent: 21:d42a756af44d
395 | | | user: test
396 | | | date: Thu Jan 01 00:00:22 1970 +0000
397 | | | summary: (22) merge two known; one far left, one far right
398 | | |
399 o | | changeset: 21:d42a756af44d
400 |\ \ \ parent: 19:31ddc2c1573b
401 | | | | parent: 20:d30ed6450e32
402 | | | | user: test
403 | | | | date: Thu Jan 01 00:00:21 1970 +0000
404 | | | | summary: (21) expand
405 | | | |
406 | o---+ changeset: 20:d30ed6450e32
407 | | | parent: 0:e6eb3150255d
408 | / / parent: 18:1aa84d96232a
409 | | | user: test
410 | | | date: Thu Jan 01 00:00:20 1970 +0000
411 | | | summary: (20) merge two known; two far right
412 | | |
413 o | | changeset: 19:31ddc2c1573b
414 |\ \ \ parent: 15:1dda3f72782d
415 | | | | parent: 17:44765d7c06e0
416 | | | | user: test
417 | | | | date: Thu Jan 01 00:00:19 1970 +0000
418 | | | | summary: (19) expand
419 | | | |
420 +-----o changeset: 18:1aa84d96232a
421 | | | parent: 1:6db2ef61d156
422 | | | parent: 15:1dda3f72782d
423 | | | user: test
424 | | | date: Thu Jan 01 00:00:18 1970 +0000
425 | | | summary: (18) merge two known; two far left
426 | | |
427 | o | changeset: 17:44765d7c06e0
428 | |\ \ parent: 12:86b91144a6e9
429 | | | | parent: 16:3677d192927d
430 | | | | user: test
431 | | | | date: Thu Jan 01 00:00:17 1970 +0000
432 | | | | summary: (17) expand
433 | | | |
434 | | o | changeset: 16:3677d192927d
435 | | | | parent: 0:e6eb3150255d
436 | | | | parent: 1:6db2ef61d156
437 | | | | user: test
438 | | | | date: Thu Jan 01 00:00:16 1970 +0000
439 | | | | summary: (16) merge two known; one immediate right, one near right
440 | | | |
441 o | | | changeset: 15:1dda3f72782d
442 |\ \ \ \ parent: 13:22d8966a97e3
443 | | | | | parent: 14:8eac370358ef
444 | | | | | user: test
445 | | | | | date: Thu Jan 01 00:00:15 1970 +0000
446 | | | | | summary: (15) expand
447 | | | | |
448 | o | | | changeset: 14:8eac370358ef
449 | |/ / / parent: 0:e6eb3150255d
450 | | | | parent: 12:86b91144a6e9
451 | | | | user: test
452 | | | | date: Thu Jan 01 00:00:14 1970 +0000
453 | | | | summary: (14) merge two known; one immediate right, one far right
454 | | | |
455 o | | | changeset: 13:22d8966a97e3
456 |\ \ \ \ parent: 9:7010c0af0a35
457 | | | | | parent: 11:832d76e6bdf2
458 | | | | | user: test
459 | | | | | date: Thu Jan 01 00:00:13 1970 +0000
460 | | | | | summary: (13) expand
461 | | | | |
462 +---o | | changeset: 12:86b91144a6e9
463 | | / / parent: 1:6db2ef61d156
464 | | | | parent: 9:7010c0af0a35
465 | | | | user: test
466 | | | | date: Thu Jan 01 00:00:12 1970 +0000
467 | | | | summary: (12) merge two known; one immediate right, one far left
468 | | | |
469 | o | | changeset: 11:832d76e6bdf2
470 | | | | parent: 6:b105a072e251
471 | | | | parent: 10:74c64d036d72
472 | | | | user: test
473 | | | | date: Thu Jan 01 00:00:11 1970 +0000
474 | | | | summary: (11) expand
475 | | | |
476 | o | | changeset: 10:74c64d036d72
477 | | | | parent: 0:e6eb3150255d
478 | | | | parent: 6:b105a072e251
479 | | | | user: test
480 | | | | date: Thu Jan 01 00:00:10 1970 +0000
481 | | | | summary: (10) merge two known; one immediate left, one near right
482 | | | |
483 o | | | changeset: 9:7010c0af0a35
484 | | | | parent: 7:b632bb1b1224
485 | | | | parent: 8:7a0b11f71937
486 | | | | user: test
487 | | | | date: Thu Jan 01 00:00:09 1970 +0000
488 | | | | summary: (9) expand
489 | | | |
490 o | | | changeset: 8:7a0b11f71937
491 | | | | parent: 0:e6eb3150255d
492 | | | | parent: 7:b632bb1b1224
493 | | | | user: test
494 | | | | date: Thu Jan 01 00:00:08 1970 +0000
495 | | | | summary: (8) merge two known; one immediate left, one far right
496 | | | |
497 o | | | changeset: 7:b632bb1b1224
498 | | | | parent: 2:3d9a33b8d1e1
499 | | | | parent: 5:4409d547b708
500 | | | | user: test
501 | | | | date: Thu Jan 01 00:00:07 1970 +0000
502 | | | | summary: (7) expand
503 | | | |
504 | o | | changeset: 6:b105a072e251
505 |/ / / parent: 2:3d9a33b8d1e1
506 | | | parent: 5:4409d547b708
507 | | | user: test
508 | | | date: Thu Jan 01 00:00:06 1970 +0000
509 | | | summary: (6) merge two known; one immediate left, one far left
510 | | |
511 o | | changeset: 5:4409d547b708
512 | | | parent: 3:27eef8ed80b4
513 | | | parent: 4:26a8bac39d9f
514 | | | user: test
515 | | | date: Thu Jan 01 00:00:05 1970 +0000
516 | | | summary: (5) expand
517 | | |
518 o | | changeset: 4:26a8bac39d9f
519 | | | parent: 1:6db2ef61d156
520 | | | parent: 3:27eef8ed80b4
521 | | | user: test
522 | | | date: Thu Jan 01 00:00:04 1970 +0000
523 | | | summary: (4) merge two known; one immediate left, one immediate right
524 | | |
525 o | | changeset: 3:27eef8ed80b4
526 | | | user: test
527 | | | date: Thu Jan 01 00:00:03 1970 +0000
528 | | | summary: (3) collapse
529 | | |
530 o | | changeset: 2:3d9a33b8d1e1
531 |/ / user: test
532 | | date: Thu Jan 01 00:00:02 1970 +0000
533 | | summary: (2) collapse
534 | |
535 o | changeset: 1:6db2ef61d156
536 |/ user: test
537 | date: Thu Jan 01 00:00:01 1970 +0000
538 | summary: (1) collapse
539 |
540 o changeset: 0:e6eb3150255d
349 user: test 541 user: test
350 date: Thu Jan 01 00:00:05 1970 +0000 542 date: Thu Jan 01 00:00:00 1970 +0000
351 summary: (5) expand 543 summary: (0) root
352 544
353 % unused arguments 545 % unused arguments
354 hg glog: invalid arguments 546 hg glog: invalid arguments
355 hg glog [OPTION]... [FILE] 547 hg glog [OPTION]... [FILE]
356 548
357 show revision history alongside an ASCII revision graph 549 show revision history alongside an ASCII revision graph
358 failed 550 failed
359 % from outer space 551 % from outer space
360 @ changeset: 34:0eed7cd895e0 552 @ changeset: 34:fea3ac5810e0
361 | tag: tip 553 | tag: tip
362 | parent: 32:77f7d8438a3c 554 | parent: 32:d06dffa21a31
363 | user: test 555 | user: test
364 | date: Thu Jan 01 00:00:34 1970 +0000 556 | date: Thu Jan 01 00:00:34 1970 +0000
365 | summary: (34) head 557 | summary: (34) head
366 | 558 |
367 o changeset: 0:7aa22e58e8c1 559 @ changeset: 34:fea3ac5810e0
368 user: test 560 | tag: tip
369 date: Thu Jan 01 00:00:00 1970 +0000 561 | parent: 32:d06dffa21a31
370 summary: (0) root 562 | user: test
371 563 | date: Thu Jan 01 00:00:34 1970 +0000
564 | summary: (34) head
565 |
372 % file log with revs != cset revs 566 % file log with revs != cset revs
373 @ changeset: 2:12c28321755b 567 @ changeset: 2:12c28321755b
374 | tag: tip 568 | tag: tip
375 | user: test 569 | user: test
376 | date: Thu Jan 01 00:00:00 1970 +0000 570 | date: Thu Jan 01 00:00:00 1970 +0000
384 % incoming and outgoing 578 % incoming and outgoing
385 requesting all changes 579 requesting all changes
386 adding changesets 580 adding changesets
387 adding manifests 581 adding manifests
388 adding file changes 582 adding file changes
389 added 31 changesets with 31 changes to 31 files 583 added 31 changesets with 31 changes to 1 files
390 o 34:0eed7cd895e0 584 o 34:fea3ac5810e0
391 | 585 |
392 | o 33:2e9d1b521374 586 | o 33:68608f5145f9
393 | 587 |
394 o 32:77f7d8438a3c 588 o 32:d06dffa21a31
395 | 589 |
396 o 27:e9e08174cd30 590 o 27:886ed638191b
397 591
398 comparing with repo2 592 comparing with repo2
399 searching for changes 593 searching for changes
400 @ changeset: 34:0eed7cd895e0 594 @ changeset: 34:fea3ac5810e0
401 | tag: tip 595 | tag: tip
402 | parent: 32:77f7d8438a3c 596 | parent: 32:d06dffa21a31
403 | user: test 597 | user: test
404 | date: Thu Jan 01 00:00:34 1970 +0000 598 | date: Thu Jan 01 00:00:34 1970 +0000
405 | summary: (34) head 599 | summary: (34) head
406 | 600 |
407 | o changeset: 33:2e9d1b521374 601 | o changeset: 33:68608f5145f9
408 | parent: 18:5a8c9a29ef81 602 | parent: 18:1aa84d96232a
409 | user: test 603 | user: test
410 | date: Thu Jan 01 00:00:33 1970 +0000 604 | date: Thu Jan 01 00:00:33 1970 +0000
411 | summary: (33) head 605 | summary: (33) head
412 | 606 |
413 o changeset: 32:77f7d8438a3c 607 o changeset: 32:d06dffa21a31
414 | parent: 27:e9e08174cd30 608 | parent: 27:886ed638191b
415 | parent: 31:82ee55204a79 609 | parent: 31:621d83e11f67
416 | user: test 610 | user: test
417 | date: Thu Jan 01 00:00:32 1970 +0000 611 | date: Thu Jan 01 00:00:32 1970 +0000
418 | summary: (32) expand 612 | summary: (32) expand
419 | 613 |
420 o changeset: 27:e9e08174cd30 614 o changeset: 27:886ed638191b
421 parent: 21:e758e8f4ace9 615 parent: 21:d42a756af44d
422 user: test 616 user: test
423 date: Thu Jan 01 00:00:27 1970 +0000 617 date: Thu Jan 01 00:00:27 1970 +0000
424 summary: (27) collapse 618 summary: (27) collapse
425 619