Mercurial > hg > mercurial-crew-with-dirclash
annotate tests/test-glog.out @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | 8d4fac0a9df7 |
children |
rev | line source |
---|---|
4340 | 1 % init |
2 % empty repo | |
3 % building tree | |
4 % glog -q | |
4583
11cf78983961
Reverted changesets 9d1380e5c8c5 and 1d46169ec197: show @ as glog parent again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4511
diff
changeset
|
5 @ 34:0eed7cd895e0 |
4340 | 6 | |
7 | o 33:2e9d1b521374 | |
8 | | | |
9 o | 32:77f7d8438a3c | |
10 |\ \ | |
11 | o \ 31:82ee55204a79 | |
12 | |\ \ | |
13 | | o \ 30:777dfc428649 | |
14 | | |\ \ | |
15 | | | o | 29:f8e7fee63353 | |
16 | | | | | | |
17 | | o | | 28:4b6e9bd48cf9 | |
18 | | |\ \ \ | |
19 o | | | | | 27:e9e08174cd30 | |
20 |/ / / / / | |
21 | | o---+ 26:720dc079a855 | |
22 | | | | | | |
23 +---o | | 25:9d4ed048d013 | |
24 | | | | | | |
25 | | o | | 24:4a68967db00d | |
26 | | |\| | | |
27 | | o | | 23:bc31393cabdf | |
28 | |/| | | | |
29 +---o---+ 22:a37f2ea6ebc6 | |
30 | | / / | |
31 o | | | 21:e758e8f4ace9 | |
32 |\ \ \ \ | |
33 | o---+-+ 20:aeccadad74b4 | |
34 | / / / | |
35 o | | | 19:138069b5dad7 | |
36 |\ \ \ \ | |
37 +---+---o 18:5a8c9a29ef81 | |
38 | | | | | |
39 | o | | 17:43e52b935494 | |
40 | |\ \ \ | |
41 | | o---+ 16:449a2f9562a4 | |
42 | | |/ / | |
43 o | | | 15:c0b4283d4c1d | |
44 |\ \ \ \ | |
45 | o-----+ 14:9d533950abf0 | |
46 | |/ / / | |
47 o | | | 13:c39d0a2b8165 | |
48 |\ \ \ \ | |
49 +---o | | 12:74dc7aea4494 | |
50 | | |/ / | |
51 | o | | 11:c3c395dd8b98 | |
52 | |\ \ \ | |
53 | | o---+ 10:8094c50149ef | |
54 | |/ / / | |
55 o | | | 9:79ab1812f961 | |
56 |\ \ \ \ | |
57 | o-----+ 8:d7aa38594334 | |
58 |/ / / / | |
59 o | | | 7:699392d1259e | |
60 |\ \ \ \ | |
61 +---o | | 6:0ca7c061cf45 | |
62 | |/ / / | |
63 | o | | 5:3589c3c477ab | |
64 | |\ \ \ | |
65 | | o | | 4:e2cad8233c77 | |
66 | |/|/ / | |
67 | o / / 3:02173ffbf857 | |
68 |/ / / | |
69 o / / 2:e8ea2256f9ec | |
70 |/ / | |
71 o / 1:3cae7826a707 | |
72 |/ | |
73 o 0:7aa22e58e8c1 | |
74 | |
75 % glog | |
4583
11cf78983961
Reverted changesets 9d1380e5c8c5 and 1d46169ec197: show @ as glog parent again.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4511
diff
changeset
|
76 @ changeset: 34:0eed7cd895e0 |
4340 | 77 | tag: tip |
78 | parent: 32:77f7d8438a3c | |
79 | user: test | |
80 | date: Thu Jan 01 00:00:34 1970 +0000 | |
81 | summary: (34) head | |
82 | | |
83 | o changeset: 33:2e9d1b521374 | |
84 | | parent: 18:5a8c9a29ef81 | |
85 | | user: test | |
86 | | date: Thu Jan 01 00:00:33 1970 +0000 | |
87 | | summary: (33) head | |
88 | | | |
89 o | changeset: 32:77f7d8438a3c | |
90 |\ \ parent: 27:e9e08174cd30 | |
91 | | | parent: 31:82ee55204a79 | |
92 | | | user: test | |
93 | | | date: Thu Jan 01 00:00:32 1970 +0000 | |
94 | | | summary: (32) expand | |
95 | | | | |
96 | o | changeset: 31:82ee55204a79 | |
97 | |\ \ parent: 21:e758e8f4ace9 | |
98 | | | | parent: 30:777dfc428649 | |
99 | | | | user: test | |
100 | | | | date: Thu Jan 01 00:00:31 1970 +0000 | |
101 | | | | summary: (31) expand | |
102 | | | | | |
103 | | o | changeset: 30:777dfc428649 | |
104 | | |\ \ parent: 28:4b6e9bd48cf9 | |
105 | | | | | parent: 29:f8e7fee63353 | |
106 | | | | | user: test | |
107 | | | | | date: Thu Jan 01 00:00:30 1970 +0000 | |
108 | | | | | summary: (30) expand | |
109 | | | | | | |
110 | | | o | changeset: 29:f8e7fee63353 | |
111 | | | | | parent: 0:7aa22e58e8c1 | |
112 | | | | | user: test | |
113 | | | | | date: Thu Jan 01 00:00:29 1970 +0000 | |
114 | | | | | summary: (29) regular commit | |
115 | | | | | | |
116 | | o | | changeset: 28:4b6e9bd48cf9 | |
117 | | |\ \ \ parent: 1:3cae7826a707 | |
118 | | | | | | parent: 26:720dc079a855 | |
119 | | | | | | user: test | |
120 | | | | | | date: Thu Jan 01 00:00:28 1970 +0000 | |
121 | | | | | | summary: (28) merge zero known | |
122 | | | | | | | |
123 o | | | | | changeset: 27:e9e08174cd30 | |
124 |/ / / / / parent: 21:e758e8f4ace9 | |
125 | | | | | user: test | |
126 | | | | | date: Thu Jan 01 00:00:27 1970 +0000 | |
127 | | | | | summary: (27) collapse | |
128 | | | | | | |
129 | | o---+ changeset: 26:720dc079a855 | |
130 | | | | | parent: 18:5a8c9a29ef81 | |
131 | | | | | parent: 25:9d4ed048d013 | |
132 | | | | | user: test | |
133 | | | | | date: Thu Jan 01 00:00:26 1970 +0000 | |
134 | | | | | summary: (26) merge one known; far right | |
135 | | | | | | |
136 +---o | | changeset: 25:9d4ed048d013 | |
137 | | | | | parent: 21:e758e8f4ace9 | |
138 | | | | | parent: 24:4a68967db00d | |
139 | | | | | user: test | |
140 | | | | | date: Thu Jan 01 00:00:25 1970 +0000 | |
141 | | | | | summary: (25) merge one known; far left | |
142 | | | | | | |
143 | | o | | changeset: 24:4a68967db00d | |
144 | | |\| | parent: 0:7aa22e58e8c1 | |
145 | | | | | parent: 23:bc31393cabdf | |
146 | | | | | user: test | |
147 | | | | | date: Thu Jan 01 00:00:24 1970 +0000 | |
148 | | | | | summary: (24) merge one known; immediate right | |
149 | | | | | | |
150 | | o | | changeset: 23:bc31393cabdf | |
151 | |/| | | parent: 1:3cae7826a707 | |
152 | | | | | parent: 22:a37f2ea6ebc6 | |
153 | | | | | user: test | |
154 | | | | | date: Thu Jan 01 00:00:23 1970 +0000 | |
155 | | | | | summary: (23) merge one known; immediate left | |
156 | | | | | | |
157 +---o---+ changeset: 22:a37f2ea6ebc6 | |
158 | | | | parent: 18:5a8c9a29ef81 | |
159 | | / / parent: 21:e758e8f4ace9 | |
160 | | | | user: test | |
161 | | | | date: Thu Jan 01 00:00:22 1970 +0000 | |
162 | | | | summary: (22) merge two known; one far left, one far right | |
163 | | | | | |
164 o | | | changeset: 21:e758e8f4ace9 | |
165 |\ \ \ \ parent: 19:138069b5dad7 | |
166 | | | | | parent: 20:aeccadad74b4 | |
167 | | | | | user: test | |
168 | | | | | date: Thu Jan 01 00:00:21 1970 +0000 | |
169 | | | | | summary: (21) expand | |
170 | | | | | | |
171 | o---+-+ changeset: 20:aeccadad74b4 | |
172 | | | | parent: 0:7aa22e58e8c1 | |
173 | / / / parent: 18:5a8c9a29ef81 | |
174 | | | | user: test | |
175 | | | | date: Thu Jan 01 00:00:20 1970 +0000 | |
176 | | | | summary: (20) merge two known; two far right | |
177 | | | | | |
178 o | | | changeset: 19:138069b5dad7 | |
179 |\ \ \ \ parent: 15:c0b4283d4c1d | |
180 | | | | | parent: 17:43e52b935494 | |
181 | | | | | user: test | |
182 | | | | | date: Thu Jan 01 00:00:19 1970 +0000 | |
183 | | | | | summary: (19) expand | |
184 | | | | | | |
185 +---+---o changeset: 18:5a8c9a29ef81 | |
186 | | | | parent: 1:3cae7826a707 | |
187 | | | | parent: 15:c0b4283d4c1d | |
188 | | | | user: test | |
189 | | | | date: Thu Jan 01 00:00:18 1970 +0000 | |
190 | | | | summary: (18) merge two known; two far left | |
191 | | | | | |
192 | o | | changeset: 17:43e52b935494 | |
193 | |\ \ \ parent: 12:74dc7aea4494 | |
194 | | | | | parent: 16:449a2f9562a4 | |
195 | | | | | user: test | |
196 | | | | | date: Thu Jan 01 00:00:17 1970 +0000 | |
197 | | | | | summary: (17) expand | |
198 | | | | | | |
199 | | o---+ changeset: 16:449a2f9562a4 | |
200 | | | | | parent: 0:7aa22e58e8c1 | |
201 | | |/ / parent: 1:3cae7826a707 | |
202 | | | | user: test | |
203 | | | | date: Thu Jan 01 00:00:16 1970 +0000 | |
204 | | | | summary: (16) merge two known; one immediate right, one near right | |
205 | | | | | |
206 o | | | changeset: 15:c0b4283d4c1d | |
207 |\ \ \ \ parent: 13:c39d0a2b8165 | |
208 | | | | | parent: 14:9d533950abf0 | |
209 | | | | | user: test | |
210 | | | | | date: Thu Jan 01 00:00:15 1970 +0000 | |
211 | | | | | summary: (15) expand | |
212 | | | | | | |
213 | o-----+ changeset: 14:9d533950abf0 | |
214 | | | | | parent: 0:7aa22e58e8c1 | |
215 | |/ / / parent: 12:74dc7aea4494 | |
216 | | | | user: test | |
217 | | | | date: Thu Jan 01 00:00:14 1970 +0000 | |
218 | | | | summary: (14) merge two known; one immediate right, one far right | |
219 | | | | | |
220 o | | | changeset: 13:c39d0a2b8165 | |
221 |\ \ \ \ parent: 9:79ab1812f961 | |
222 | | | | | parent: 11:c3c395dd8b98 | |
223 | | | | | user: test | |
224 | | | | | date: Thu Jan 01 00:00:13 1970 +0000 | |
225 | | | | | summary: (13) expand | |
226 | | | | | | |
227 +---o | | changeset: 12:74dc7aea4494 | |
228 | | |/ / parent: 1:3cae7826a707 | |
229 | | | | parent: 9:79ab1812f961 | |
230 | | | | user: test | |
231 | | | | date: Thu Jan 01 00:00:12 1970 +0000 | |
232 | | | | summary: (12) merge two known; one immediate right, one far left | |
233 | | | | | |
234 | o | | changeset: 11:c3c395dd8b98 | |
235 | |\ \ \ parent: 6:0ca7c061cf45 | |
236 | | | | | parent: 10:8094c50149ef | |
237 | | | | | user: test | |
238 | | | | | date: Thu Jan 01 00:00:11 1970 +0000 | |
239 | | | | | summary: (11) expand | |
240 | | | | | | |
241 | | o---+ changeset: 10:8094c50149ef | |
242 | | | | | parent: 0:7aa22e58e8c1 | |
243 | |/ / / parent: 6:0ca7c061cf45 | |
244 | | | | user: test | |
245 | | | | date: Thu Jan 01 00:00:10 1970 +0000 | |
246 | | | | summary: (10) merge two known; one immediate left, one near right | |
247 | | | | | |
248 o | | | changeset: 9:79ab1812f961 | |
249 |\ \ \ \ parent: 7:699392d1259e | |
250 | | | | | parent: 8:d7aa38594334 | |
251 | | | | | user: test | |
252 | | | | | date: Thu Jan 01 00:00:09 1970 +0000 | |
253 | | | | | summary: (9) expand | |
254 | | | | | | |
255 | o-----+ changeset: 8:d7aa38594334 | |
256 | | | | | parent: 0:7aa22e58e8c1 | |
257 |/ / / / parent: 7:699392d1259e | |
258 | | | | user: test | |
259 | | | | date: Thu Jan 01 00:00:08 1970 +0000 | |
260 | | | | summary: (8) merge two known; one immediate left, one far right | |
261 | | | | | |
262 o | | | changeset: 7:699392d1259e | |
263 |\ \ \ \ parent: 2:e8ea2256f9ec | |
264 | | | | | parent: 5:3589c3c477ab | |
265 | | | | | user: test | |
266 | | | | | date: Thu Jan 01 00:00:07 1970 +0000 | |
267 | | | | | summary: (7) expand | |
268 | | | | | | |
269 +---o | | changeset: 6:0ca7c061cf45 | |
270 | |/ / / parent: 2:e8ea2256f9ec | |
271 | | | | parent: 5:3589c3c477ab | |
272 | | | | user: test | |
273 | | | | date: Thu Jan 01 00:00:06 1970 +0000 | |
274 | | | | summary: (6) merge two known; one immediate left, one far left | |
275 | | | | | |
276 | o | | changeset: 5:3589c3c477ab | |
277 | |\ \ \ parent: 3:02173ffbf857 | |
278 | | | | | parent: 4:e2cad8233c77 | |
279 | | | | | user: test | |
280 | | | | | date: Thu Jan 01 00:00:05 1970 +0000 | |
281 | | | | | summary: (5) expand | |
282 | | | | | | |
283 | | o | | changeset: 4:e2cad8233c77 | |
284 | |/|/ / parent: 1:3cae7826a707 | |
285 | | | | parent: 3:02173ffbf857 | |
286 | | | | user: test | |
287 | | | | date: Thu Jan 01 00:00:04 1970 +0000 | |
288 | | | | summary: (4) merge two known; one immediate left, one immediate right | |
289 | | | | | |
290 | o | | changeset: 3:02173ffbf857 | |
291 |/ / / user: test | |
292 | | | date: Thu Jan 01 00:00:03 1970 +0000 | |
293 | | | summary: (3) collapse | |
294 | | | | |
295 o | | changeset: 2:e8ea2256f9ec | |
296 |/ / user: test | |
297 | | date: Thu Jan 01 00:00:02 1970 +0000 | |
298 | | summary: (2) collapse | |
299 | | | |
300 o | changeset: 1:3cae7826a707 | |
301 |/ user: test | |
302 | date: Thu Jan 01 00:00:01 1970 +0000 | |
303 | summary: (1) collapse | |
304 | | |
305 o changeset: 0:7aa22e58e8c1 | |
306 user: test | |
307 date: Thu Jan 01 00:00:00 1970 +0000 | |
308 summary: (0) root | |
309 | |
4735
8d4fac0a9df7
Make hg glog abort if unused arguments are given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
310 % unused arguments |
8d4fac0a9df7
Make hg glog abort if unused arguments are given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
311 hg glog: invalid arguments |
8d4fac0a9df7
Make hg glog abort if unused arguments are given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
312 hg glog [OPTION]... |
8d4fac0a9df7
Make hg glog abort if unused arguments are given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
313 |
8d4fac0a9df7
Make hg glog abort if unused arguments are given.
Thomas Arendsen Hein <thomas@intevation.de>
parents:
4583
diff
changeset
|
314 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
|
315 failed |