| author | Martin Geisler <mg@daimi.au.dk> |
| Wed, 04 Feb 2009 20:53:38 +0100 | |
| changeset 7736 | fb0776fe3e38 |
| parent 7714 | f6cee47c0907 |
| child 8397 | 613ac2856535 |
| permissions | -rw-r--r-- |
| 4344 | 1 |
% init |
2 |
% empty repo |
|
3 |
% building tree |
|
|
6385
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
4 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
5 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
6 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
7 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
8 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
9 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
10 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
11 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
12 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
13 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
14 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
15 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
16 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
17 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
18 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
19 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
20 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
21 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
22 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
23 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
24 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
25 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
26 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
27 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
28 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
29 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
30 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
31 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
32 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
33 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
34 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
35 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
36 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
37 |
(the rawcommit command is deprecated) |
|
0d4e068e9e52
commit: when committing the results of a merge, it's all or nothing
Bryan O'Sullivan <bos@serpentine.com>
parents:
6336
diff
changeset
|
38 |
(the rawcommit command is deprecated) |
| 4344 | 39 |
% glog -q |
|
4583
11cf78983961
Reverted changesets 9d1380e5c8c5 and 1d46169ec197: show @ as glog parent again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4511
diff
changeset
|
40 |
@ 34:0eed7cd895e0 |
| 4344 | 41 |
| |
42 |
| o 33:2e9d1b521374 |
|
43 |
| | |
|
44 |
o | 32:77f7d8438a3c |
|
45 |
|\ \ |
|
46 |
| o \ 31:82ee55204a79 |
|
47 |
| |\ \ |
|
48 |
| | o \ 30:777dfc428649 |
|
49 |
| | |\ \ |
|
50 |
| | | o | 29:f8e7fee63353 |
|
51 |
| | | | | |
|
52 |
| | o | | 28:4b6e9bd48cf9 |
|
53 |
| | |\ \ \ |
|
54 |
o | | | | | 27:e9e08174cd30 |
|
55 |
|/ / / / / |
|
56 |
| | o---+ 26:720dc079a855 |
|
57 |
| | | | | |
|
58 |
+---o | | 25:9d4ed048d013 |
|
59 |
| | | | | |
|
60 |
| | o | | 24:4a68967db00d |
|
61 |
| | |\| | |
|
62 |
| | o | | 23:bc31393cabdf |
|
63 |
| |/| | | |
|
64 |
+---o---+ 22:a37f2ea6ebc6 |
|
65 |
| | / / |
|
66 |
o | | | 21:e758e8f4ace9 |
|
67 |
|\ \ \ \ |
|
68 |
| o---+-+ 20:aeccadad74b4 |
|
69 |
| / / / |
|
70 |
o | | | 19:138069b5dad7 |
|
71 |
|\ \ \ \ |
|
72 |
+---+---o 18:5a8c9a29ef81 |
|
73 |
| | | | |
|
74 |
| o | | 17:43e52b935494 |
|
75 |
| |\ \ \ |
|
76 |
| | o---+ 16:449a2f9562a4 |
|
77 |
| | |/ / |
|
78 |
o | | | 15:c0b4283d4c1d |
|
79 |
|\ \ \ \ |
|
80 |
| o-----+ 14:9d533950abf0 |
|
81 |
| |/ / / |
|
82 |
o | | | 13:c39d0a2b8165 |
|
83 |
|\ \ \ \ |
|
84 |
+---o | | 12:74dc7aea4494 |
|
85 |
| | |/ / |
|
86 |
| o | | 11:c3c395dd8b98 |
|
87 |
| |\ \ \ |
|
88 |
| | o---+ 10:8094c50149ef |
|
89 |
| |/ / / |
|
90 |
o | | | 9:79ab1812f961 |
|
91 |
|\ \ \ \ |
|
92 |
| o-----+ 8:d7aa38594334 |
|
93 |
|/ / / / |
|
94 |
o | | | 7:699392d1259e |
|
95 |
|\ \ \ \ |
|
96 |
+---o | | 6:0ca7c061cf45 |
|
97 |
| |/ / / |
|
98 |
| o | | 5:3589c3c477ab |
|
99 |
| |\ \ \ |
|
100 |
| | o | | 4:e2cad8233c77 |
|
101 |
| |/|/ / |
|
102 |
| o / / 3:02173ffbf857 |
|
103 |
|/ / / |
|
104 |
o / / 2:e8ea2256f9ec |
|
105 |
|/ / |
|
106 |
o / 1:3cae7826a707 |
|
107 |
|/ |
|
108 |
o 0:7aa22e58e8c1 |
|
109 |
||
110 |
% glog |
|
|
4583
11cf78983961
Reverted changesets 9d1380e5c8c5 and 1d46169ec197: show @ as glog parent again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4511
diff
changeset
|
111 |
@ changeset: 34:0eed7cd895e0 |
| 4344 | 112 |
| tag: tip |
113 |
| parent: 32:77f7d8438a3c |
|
114 |
| user: test |
|
115 |
| date: Thu Jan 01 00:00:34 1970 +0000 |
|
116 |
| summary: (34) head |
|
117 |
| |
|
118 |
| o changeset: 33:2e9d1b521374 |
|
119 |
| | parent: 18:5a8c9a29ef81 |
|
120 |
| | user: test |
|
121 |
| | date: Thu Jan 01 00:00:33 1970 +0000 |
|
122 |
| | summary: (33) head |
|
123 |
| | |
|
124 |
o | changeset: 32:77f7d8438a3c |
|
125 |
|\ \ parent: 27:e9e08174cd30 |
|
126 |
| | | parent: 31:82ee55204a79 |
|
127 |
| | | user: test |
|
128 |
| | | date: Thu Jan 01 00:00:32 1970 +0000 |
|
129 |
| | | summary: (32) expand |
|
130 |
| | | |
|
131 |
| o | changeset: 31:82ee55204a79 |
|
132 |
| |\ \ parent: 21:e758e8f4ace9 |
|
133 |
| | | | parent: 30:777dfc428649 |
|
134 |
| | | | user: test |
|
135 |
| | | | date: Thu Jan 01 00:00:31 1970 +0000 |
|
136 |
| | | | summary: (31) expand |
|
137 |
| | | | |
|
138 |
| | o | changeset: 30:777dfc428649 |
|
139 |
| | |\ \ parent: 28:4b6e9bd48cf9 |
|
140 |
| | | | | parent: 29:f8e7fee63353 |
|
141 |
| | | | | user: test |
|
142 |
| | | | | date: Thu Jan 01 00:00:30 1970 +0000 |
|
143 |
| | | | | summary: (30) expand |
|
144 |
| | | | | |
|
145 |
| | | o | changeset: 29:f8e7fee63353 |
|
146 |
| | | | | parent: 0:7aa22e58e8c1 |
|
147 |
| | | | | user: test |
|
148 |
| | | | | date: Thu Jan 01 00:00:29 1970 +0000 |
|
149 |
| | | | | summary: (29) regular commit |
|
150 |
| | | | | |
|
151 |
| | o | | changeset: 28:4b6e9bd48cf9 |
|
152 |
| | |\ \ \ parent: 1:3cae7826a707 |
|
153 |
| | | | | | parent: 26:720dc079a855 |
|
154 |
| | | | | | user: test |
|
155 |
| | | | | | date: Thu Jan 01 00:00:28 1970 +0000 |
|
156 |
| | | | | | summary: (28) merge zero known |
|
157 |
| | | | | | |
|
158 |
o | | | | | changeset: 27:e9e08174cd30 |
|
159 |
|/ / / / / parent: 21:e758e8f4ace9 |
|
160 |
| | | | | user: test |
|
161 |
| | | | | date: Thu Jan 01 00:00:27 1970 +0000 |
|
162 |
| | | | | summary: (27) collapse |
|
163 |
| | | | | |
|
164 |
| | o---+ changeset: 26:720dc079a855 |
|
165 |
| | | | | parent: 18:5a8c9a29ef81 |
|
166 |
| | | | | parent: 25:9d4ed048d013 |
|
167 |
| | | | | user: test |
|
168 |
| | | | | date: Thu Jan 01 00:00:26 1970 +0000 |
|
169 |
| | | | | summary: (26) merge one known; far right |
|
170 |
| | | | | |
|
171 |
+---o | | changeset: 25:9d4ed048d013 |
|
172 |
| | | | | parent: 21:e758e8f4ace9 |
|
173 |
| | | | | parent: 24:4a68967db00d |
|
174 |
| | | | | user: test |
|
175 |
| | | | | date: Thu Jan 01 00:00:25 1970 +0000 |
|
176 |
| | | | | summary: (25) merge one known; far left |
|
177 |
| | | | | |
|
178 |
| | o | | changeset: 24:4a68967db00d |
|
179 |
| | |\| | parent: 0:7aa22e58e8c1 |
|
180 |
| | | | | parent: 23:bc31393cabdf |
|
181 |
| | | | | user: test |
|
182 |
| | | | | date: Thu Jan 01 00:00:24 1970 +0000 |
|
183 |
| | | | | summary: (24) merge one known; immediate right |
|
184 |
| | | | | |
|
185 |
| | o | | changeset: 23:bc31393cabdf |
|
186 |
| |/| | | parent: 1:3cae7826a707 |
|
187 |
| | | | | parent: 22:a37f2ea6ebc6 |
|
188 |
| | | | | user: test |
|
189 |
| | | | | date: Thu Jan 01 00:00:23 1970 +0000 |
|
190 |
| | | | | summary: (23) merge one known; immediate left |
|
191 |
| | | | | |
|
192 |
+---o---+ changeset: 22:a37f2ea6ebc6 |
|
193 |
| | | | parent: 18:5a8c9a29ef81 |
|
194 |
| | / / parent: 21:e758e8f4ace9 |
|
195 |
| | | | user: test |
|
196 |
| | | | date: Thu Jan 01 00:00:22 1970 +0000 |
|
197 |
| | | | summary: (22) merge two known; one far left, one far right |
|
198 |
| | | | |
|
199 |
o | | | changeset: 21:e758e8f4ace9 |
|
200 |
|\ \ \ \ parent: 19:138069b5dad7 |
|
201 |
| | | | | parent: 20:aeccadad74b4 |
|
202 |
| | | | | user: test |
|
203 |
| | | | | date: Thu Jan 01 00:00:21 1970 +0000 |
|
204 |
| | | | | summary: (21) expand |
|
205 |
| | | | | |
|
206 |
| o---+-+ changeset: 20:aeccadad74b4 |
|
207 |
| | | | parent: 0:7aa22e58e8c1 |
|
208 |
| / / / parent: 18:5a8c9a29ef81 |
|
209 |
| | | | user: test |
|
210 |
| | | | date: Thu Jan 01 00:00:20 1970 +0000 |
|
211 |
| | | | summary: (20) merge two known; two far right |
|
212 |
| | | | |
|
213 |
o | | | changeset: 19:138069b5dad7 |
|
214 |
|\ \ \ \ parent: 15:c0b4283d4c1d |
|
215 |
| | | | | parent: 17:43e52b935494 |
|
216 |
| | | | | user: test |
|
217 |
| | | | | date: Thu Jan 01 00:00:19 1970 +0000 |
|
218 |
| | | | | summary: (19) expand |
|
219 |
| | | | | |
|
220 |
+---+---o changeset: 18:5a8c9a29ef81 |
|
221 |
| | | | parent: 1:3cae7826a707 |
|
222 |
| | | | parent: 15:c0b4283d4c1d |
|
223 |
| | | | user: test |
|
224 |
| | | | date: Thu Jan 01 00:00:18 1970 +0000 |
|
225 |
| | | | summary: (18) merge two known; two far left |
|
226 |
| | | | |
|
227 |
| o | | changeset: 17:43e52b935494 |
|
228 |
| |\ \ \ parent: 12:74dc7aea4494 |
|
229 |
| | | | | parent: 16:449a2f9562a4 |
|
230 |
| | | | | user: test |
|
231 |
| | | | | date: Thu Jan 01 00:00:17 1970 +0000 |
|
232 |
| | | | | summary: (17) expand |
|
233 |
| | | | | |
|
234 |
| | o---+ changeset: 16:449a2f9562a4 |
|
235 |
| | | | | parent: 0:7aa22e58e8c1 |
|
236 |
| | |/ / parent: 1:3cae7826a707 |
|
237 |
| | | | user: test |
|
238 |
| | | | date: Thu Jan 01 00:00:16 1970 +0000 |
|
239 |
| | | | summary: (16) merge two known; one immediate right, one near right |
|
240 |
| | | | |
|
241 |
o | | | changeset: 15:c0b4283d4c1d |
|
242 |
|\ \ \ \ parent: 13:c39d0a2b8165 |
|
243 |
| | | | | parent: 14:9d533950abf0 |
|
244 |
| | | | | user: test |
|
245 |
| | | | | date: Thu Jan 01 00:00:15 1970 +0000 |
|
246 |
| | | | | summary: (15) expand |
|
247 |
| | | | | |
|
248 |
| o-----+ changeset: 14:9d533950abf0 |
|
249 |
| | | | | parent: 0:7aa22e58e8c1 |
|
250 |
| |/ / / parent: 12:74dc7aea4494 |
|
251 |
| | | | user: test |
|
252 |
| | | | date: Thu Jan 01 00:00:14 1970 +0000 |
|
253 |
| | | | summary: (14) merge two known; one immediate right, one far right |
|
254 |
| | | | |
|
255 |
o | | | changeset: 13:c39d0a2b8165 |
|
256 |
|\ \ \ \ parent: 9:79ab1812f961 |
|
257 |
| | | | | parent: 11:c3c395dd8b98 |
|
258 |
| | | | | user: test |
|
259 |
| | | | | date: Thu Jan 01 00:00:13 1970 +0000 |
|
260 |
| | | | | summary: (13) expand |
|
261 |
| | | | | |
|
262 |
+---o | | changeset: 12:74dc7aea4494 |
|
263 |
| | |/ / parent: 1:3cae7826a707 |
|
264 |
| | | | parent: 9:79ab1812f961 |
|
265 |
| | | | user: test |
|
266 |
| | | | date: Thu Jan 01 00:00:12 1970 +0000 |
|
267 |
| | | | summary: (12) merge two known; one immediate right, one far left |
|
268 |
| | | | |
|
269 |
| o | | changeset: 11:c3c395dd8b98 |
|
270 |
| |\ \ \ parent: 6:0ca7c061cf45 |
|
271 |
| | | | | parent: 10:8094c50149ef |
|
272 |
| | | | | user: test |
|
273 |
| | | | | date: Thu Jan 01 00:00:11 1970 +0000 |
|
274 |
| | | | | summary: (11) expand |
|
275 |
| | | | | |
|
276 |
| | o---+ changeset: 10:8094c50149ef |
|
277 |
| | | | | parent: 0:7aa22e58e8c1 |
|
278 |
| |/ / / parent: 6:0ca7c061cf45 |
|
279 |
| | | | user: test |
|
280 |
| | | | date: Thu Jan 01 00:00:10 1970 +0000 |
|
281 |
| | | | summary: (10) merge two known; one immediate left, one near right |
|
282 |
| | | | |
|
283 |
o | | | changeset: 9:79ab1812f961 |
|
284 |
|\ \ \ \ parent: 7:699392d1259e |
|
285 |
| | | | | parent: 8:d7aa38594334 |
|
286 |
| | | | | user: test |
|
287 |
| | | | | date: Thu Jan 01 00:00:09 1970 +0000 |
|
288 |
| | | | | summary: (9) expand |
|
289 |
| | | | | |
|
290 |
| o-----+ changeset: 8:d7aa38594334 |
|
291 |
| | | | | parent: 0:7aa22e58e8c1 |
|
292 |
|/ / / / parent: 7:699392d1259e |
|
293 |
| | | | user: test |
|
294 |
| | | | date: Thu Jan 01 00:00:08 1970 +0000 |
|
295 |
| | | | summary: (8) merge two known; one immediate left, one far right |
|
296 |
| | | | |
|
297 |
o | | | changeset: 7:699392d1259e |
|
298 |
|\ \ \ \ parent: 2:e8ea2256f9ec |
|
299 |
| | | | | parent: 5:3589c3c477ab |
|
300 |
| | | | | user: test |
|
301 |
| | | | | date: Thu Jan 01 00:00:07 1970 +0000 |
|
302 |
| | | | | summary: (7) expand |
|
303 |
| | | | | |
|
304 |
+---o | | changeset: 6:0ca7c061cf45 |
|
305 |
| |/ / / parent: 2:e8ea2256f9ec |
|
306 |
| | | | parent: 5:3589c3c477ab |
|
307 |
| | | | user: test |
|
308 |
| | | | date: Thu Jan 01 00:00:06 1970 +0000 |
|
309 |
| | | | summary: (6) merge two known; one immediate left, one far left |
|
310 |
| | | | |
|
311 |
| o | | changeset: 5:3589c3c477ab |
|
312 |
| |\ \ \ parent: 3:02173ffbf857 |
|
313 |
| | | | | parent: 4:e2cad8233c77 |
|
314 |
| | | | | user: test |
|
315 |
| | | | | date: Thu Jan 01 00:00:05 1970 +0000 |
|
316 |
| | | | | summary: (5) expand |
|
317 |
| | | | | |
|
318 |
| | o | | changeset: 4:e2cad8233c77 |
|
319 |
| |/|/ / parent: 1:3cae7826a707 |
|
320 |
| | | | parent: 3:02173ffbf857 |
|
321 |
| | | | user: test |
|
322 |
| | | | date: Thu Jan 01 00:00:04 1970 +0000 |
|
323 |
| | | | summary: (4) merge two known; one immediate left, one immediate right |
|
324 |
| | | | |
|
325 |
| o | | changeset: 3:02173ffbf857 |
|
326 |
|/ / / user: test |
|
327 |
| | | date: Thu Jan 01 00:00:03 1970 +0000 |
|
328 |
| | | summary: (3) collapse |
|
329 |
| | | |
|
330 |
o | | changeset: 2:e8ea2256f9ec |
|
331 |
|/ / user: test |
|
332 |
| | date: Thu Jan 01 00:00:02 1970 +0000 |
|
333 |
| | summary: (2) collapse |
|
334 |
| | |
|
335 |
o | changeset: 1:3cae7826a707 |
|
336 |
|/ user: test |
|
337 |
| date: Thu Jan 01 00:00:01 1970 +0000 |
|
338 |
| summary: (1) collapse |
|
339 |
| |
|
340 |
o changeset: 0:7aa22e58e8c1 |
|
341 |
user: test |
|
342 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
343 |
summary: (0) root |
|
344 |
||
|
5939
56e8a54bf71d
graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
345 |
% file glog |
|
56e8a54bf71d
graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
346 |
o changeset: 5:3589c3c477ab |
|
56e8a54bf71d
graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
347 |
parent: 3:02173ffbf857 |
|
56e8a54bf71d
graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
348 |
parent: 4:e2cad8233c77 |
|
56e8a54bf71d
graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
349 |
user: test |
|
56e8a54bf71d
graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
350 |
date: Thu Jan 01 00:00:05 1970 +0000 |
|
56e8a54bf71d
graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
351 |
summary: (5) expand |
|
56e8a54bf71d
graphlog: add test for filelog graph
Steve Borho <steve@borho.org>
parents:
4735
diff
changeset
|
352 |
|
|
4735
8d4fac0a9df7
Make hg glog abort if unused arguments are given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
353 |
% unused arguments |
|
8d4fac0a9df7
Make hg glog abort if unused arguments are given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
354 |
hg glog: invalid arguments |
|
5942
b75105de8573
glog shows at most one file: correct synopsis
Thomas Arendsen Hein <thomas@intevation.de>
parents:
5941
diff
changeset
|
355 |
hg glog [OPTION]... [FILE] |
|
4735
8d4fac0a9df7
Make hg glog abort if unused arguments are given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
356 |
|
|
8d4fac0a9df7
Make hg glog abort if unused arguments are given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
357 |
show revision history alongside an ASCII revision graph |
|
8d4fac0a9df7
Make hg glog abort if unused arguments are given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
358 |
failed |
|
6969
d76f64cd4cb2
graphlog: fix calls from outside the repository (issue1285)
Patrick Mezard <pmezard@gmail.com>
parents:
6385
diff
changeset
|
359 |
% from outer space |
|
d76f64cd4cb2
graphlog: fix calls from outside the repository (issue1285)
Patrick Mezard <pmezard@gmail.com>
parents:
6385
diff
changeset
|
360 |
@ changeset: 34:0eed7cd895e0 |
|
d76f64cd4cb2
graphlog: fix calls from outside the repository (issue1285)
Patrick Mezard <pmezard@gmail.com>
parents:
6385
diff
changeset
|
361 |
| tag: tip |
|
d76f64cd4cb2
graphlog: fix calls from outside the repository (issue1285)
Patrick Mezard <pmezard@gmail.com>
parents:
6385
diff
changeset
|
362 |
| parent: 32:77f7d8438a3c |
|
d76f64cd4cb2
graphlog: fix calls from outside the repository (issue1285)
Patrick Mezard <pmezard@gmail.com>
parents:
6385
diff
changeset
|
363 |
| user: test |
|
d76f64cd4cb2
graphlog: fix calls from outside the repository (issue1285)
Patrick Mezard <pmezard@gmail.com>
parents:
6385
diff
changeset
|
364 |
| date: Thu Jan 01 00:00:34 1970 +0000 |
|
d76f64cd4cb2
graphlog: fix calls from outside the repository (issue1285)
Patrick Mezard <pmezard@gmail.com>
parents:
6385
diff
changeset
|
365 |
| summary: (34) head |
|
d76f64cd4cb2
graphlog: fix calls from outside the repository (issue1285)
Patrick Mezard <pmezard@gmail.com>
parents:
6385
diff
changeset
|
366 |
| |
|
d76f64cd4cb2
graphlog: fix calls from outside the repository (issue1285)
Patrick Mezard <pmezard@gmail.com>
parents:
6385
diff
changeset
|
367 |
o changeset: 0:7aa22e58e8c1 |
|
d76f64cd4cb2
graphlog: fix calls from outside the repository (issue1285)
Patrick Mezard <pmezard@gmail.com>
parents:
6385
diff
changeset
|
368 |
user: test |
|
d76f64cd4cb2
graphlog: fix calls from outside the repository (issue1285)
Patrick Mezard <pmezard@gmail.com>
parents:
6385
diff
changeset
|
369 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
d76f64cd4cb2
graphlog: fix calls from outside the repository (issue1285)
Patrick Mezard <pmezard@gmail.com>
parents:
6385
diff
changeset
|
370 |
summary: (0) root |
|
d76f64cd4cb2
graphlog: fix calls from outside the repository (issue1285)
Patrick Mezard <pmezard@gmail.com>
parents:
6385
diff
changeset
|
371 |
|
|
7383
b501c7f3c2ad
graphlog: fix regression with filelogs introduced by 7bc62ebe7693
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6969
diff
changeset
|
372 |
% file log with revs != cset revs |
|
b501c7f3c2ad
graphlog: fix regression with filelogs introduced by 7bc62ebe7693
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6969
diff
changeset
|
373 |
@ changeset: 2:12c28321755b |
|
b501c7f3c2ad
graphlog: fix regression with filelogs introduced by 7bc62ebe7693
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6969
diff
changeset
|
374 |
| tag: tip |
|
b501c7f3c2ad
graphlog: fix regression with filelogs introduced by 7bc62ebe7693
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6969
diff
changeset
|
375 |
| user: test |
|
b501c7f3c2ad
graphlog: fix regression with filelogs introduced by 7bc62ebe7693
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6969
diff
changeset
|
376 |
| date: Thu Jan 01 00:00:00 1970 +0000 |
|
b501c7f3c2ad
graphlog: fix regression with filelogs introduced by 7bc62ebe7693
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6969
diff
changeset
|
377 |
| summary: more |
|
b501c7f3c2ad
graphlog: fix regression with filelogs introduced by 7bc62ebe7693
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6969
diff
changeset
|
378 |
| |
|
b501c7f3c2ad
graphlog: fix regression with filelogs introduced by 7bc62ebe7693
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6969
diff
changeset
|
379 |
o changeset: 1:5ac72c0599bf |
|
b501c7f3c2ad
graphlog: fix regression with filelogs introduced by 7bc62ebe7693
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6969
diff
changeset
|
380 |
user: test |
|
b501c7f3c2ad
graphlog: fix regression with filelogs introduced by 7bc62ebe7693
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6969
diff
changeset
|
381 |
date: Thu Jan 01 00:00:00 1970 +0000 |
|
b501c7f3c2ad
graphlog: fix regression with filelogs introduced by 7bc62ebe7693
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6969
diff
changeset
|
382 |
summary: two |
|
b501c7f3c2ad
graphlog: fix regression with filelogs introduced by 7bc62ebe7693
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
6969
diff
changeset
|
383 |
|
|
7714
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
384 |
% incoming and outgoing |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
385 |
requesting all changes |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
386 |
adding changesets |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
387 |
adding manifests |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
388 |
adding file changes |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
389 |
added 31 changesets with 31 changes to 31 files |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
390 |
o 34:0eed7cd895e0 |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
391 |
| |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
392 |
| o 33:2e9d1b521374 |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
393 |
| |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
394 |
o 32:77f7d8438a3c |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
395 |
| |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
396 |
o 27:e9e08174cd30 |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
397 |
|
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
398 |
comparing with repo2 |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
399 |
searching for changes |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
400 |
@ changeset: 34:0eed7cd895e0 |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
401 |
| tag: tip |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
402 |
| parent: 32:77f7d8438a3c |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
403 |
| user: test |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
404 |
| date: Thu Jan 01 00:00:34 1970 +0000 |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
405 |
| summary: (34) head |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
406 |
| |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
407 |
| o changeset: 33:2e9d1b521374 |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
408 |
| parent: 18:5a8c9a29ef81 |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
409 |
| user: test |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
410 |
| date: Thu Jan 01 00:00:33 1970 +0000 |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
411 |
| summary: (33) head |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
412 |
| |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
413 |
o changeset: 32:77f7d8438a3c |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
414 |
| parent: 27:e9e08174cd30 |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
415 |
| parent: 31:82ee55204a79 |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
416 |
| user: test |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
417 |
| date: Thu Jan 01 00:00:32 1970 +0000 |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
418 |
| summary: (32) expand |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
419 |
| |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
420 |
o changeset: 27:e9e08174cd30 |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
421 |
parent: 21:e758e8f4ace9 |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
422 |
user: test |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
423 |
date: Thu Jan 01 00:00:27 1970 +0000 |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
424 |
summary: (27) collapse |
|
f6cee47c0907
graphlog: some testing for incoming and outgoing graphs
Dirkjan Ochtman <dirkjan@ochtman.nl>
parents:
7383
diff
changeset
|
425 |