equal
deleted
inserted
replaced
1 $ echo "[extensions]" >> $HGRCPATH |
1 $ echo "[extensions]" >> $HGRCPATH |
2 $ echo "graphlog=" >> $HGRCPATH |
2 $ echo "graphlog=" >> $HGRCPATH |
3 |
3 |
4 overwritten and appended files |
4 plain |
5 |
5 |
6 $ rm -rf repo |
6 $ rm -rf repo |
7 $ hg init repo |
7 $ hg init repo |
8 $ cd repo |
8 $ cd repo |
9 $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -oa |
9 $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' |
|
10 tags |
|
11 $ cat .hg/localtags |
|
12 66f7d451a68b85ed82ff5fcc254daf50c74144bd f |
|
13 bebd167eb94d257ace0e814aeb98e6972ed2970d p2 |
10 dag |
14 dag |
11 $ hg debugdag -t -b |
15 $ hg debugdag -t -b |
12 +2:f |
16 +2:f |
13 +3:p2 |
17 +3:p2 |
14 @temp*f+3 |
18 @temp*f+3 |
15 @default*/p2+2:tip |
19 @default*/p2+2:tip |
16 tip |
20 tip |
17 $ hg id |
21 $ hg id |
18 f96e381c614c tip |
22 000000000000 |
19 glog |
23 glog |
20 $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n' |
24 $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n' |
21 @ 11: r11 [] @ 11.00 |
25 o 11: r11 [] @ 11.00 |
|
26 | |
|
27 o 10: r10 [] @ 10.00 |
|
28 | |
|
29 o 9: r9 [] @ 9.00 |
|
30 |\ |
|
31 | o 8: r8 [temp] @ 8.00 |
|
32 | | |
|
33 | o 7: r7 [temp] @ 7.00 |
|
34 | | |
|
35 | o 6: r6 [temp] @ 6.00 |
|
36 | | |
|
37 | o 5: r5 [temp] @ 5.00 |
|
38 | | |
|
39 o | 4: r4 [] @ 4.00 |
|
40 | | |
|
41 o | 3: r3 [] @ 3.00 |
|
42 | | |
|
43 o | 2: r2 [] @ 2.00 |
|
44 |/ |
|
45 o 1: r1 [] @ 1.00 |
|
46 | |
|
47 o 0: r0 [] @ 0.00 |
|
48 |
|
49 |
|
50 overwritten files |
|
51 |
|
52 $ rm -rf repo |
|
53 $ hg init repo |
|
54 $ cd repo |
|
55 $ hg debugbuilddag '+2:f +3:p2 @temp <f+4 @default /p2 +2' -q -o |
|
56 tags |
|
57 $ cat .hg/localtags |
|
58 2a8ed67d317e370eac733dccc501b12d7b9c441a f |
|
59 4226a30965b7af58f94d0cda7e6c2c9c63e6bf90 p2 |
|
60 dag |
|
61 $ hg debugdag -t -b |
|
62 +2:f |
|
63 +3:p2 |
|
64 @temp*f+3 |
|
65 @default*/p2+2:tip |
|
66 tip |
|
67 $ hg id |
|
68 000000000000 |
|
69 glog |
|
70 $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n' |
|
71 o 11: r11 [] @ 11.00 |
22 | |
72 | |
23 o 10: r10 [] @ 10.00 |
73 o 10: r10 [] @ 10.00 |
24 | |
74 | |
25 o 9: r9 [] @ 9.00 |
75 o 9: r9 [] @ 9.00 |
26 |\ |
76 |\ |
42 | |
92 | |
43 o 0: r0 [] @ 0.00 |
93 o 0: r0 [] @ 0.00 |
44 |
94 |
45 glog of |
95 glog of |
46 $ hg glog --template '{rev}: {desc} [{branches}]\n' of |
96 $ hg glog --template '{rev}: {desc} [{branches}]\n' of |
47 @ 11: r11 [] |
97 o 11: r11 [] |
48 | |
|
49 o 10: r10 [] |
|
50 | |
|
51 o 9: r9 [] |
|
52 |\ |
|
53 | o 8: r8 [temp] |
|
54 | | |
|
55 | o 7: r7 [temp] |
|
56 | | |
|
57 | o 6: r6 [temp] |
|
58 | | |
|
59 | o 5: r5 [temp] |
|
60 | | |
|
61 o | 4: r4 [] |
|
62 | | |
|
63 o | 3: r3 [] |
|
64 | | |
|
65 o | 2: r2 [] |
|
66 |/ |
|
67 o 1: r1 [] |
|
68 | |
|
69 o 0: r0 [] |
|
70 |
|
71 glog af |
|
72 $ hg glog --template '{rev}: {desc} [{branches}]\n' af |
|
73 @ 11: r11 [] |
|
74 | |
98 | |
75 o 10: r10 [] |
99 o 10: r10 [] |
76 | |
100 | |
77 o 9: r9 [] |
101 o 9: r9 [] |
78 |\ |
102 |\ |
94 | |
118 | |
95 o 0: r0 [] |
119 o 0: r0 [] |
96 |
120 |
97 tags |
121 tags |
98 $ hg tags -v |
122 $ hg tags -v |
99 tip 11:f96e381c614c |
123 tip 11:58a51e5eb988 |
100 p2 4:d9d6db981b55 local |
124 p2 4:4226a30965b7 local |
101 f 1:73253def624e local |
125 f 1:2a8ed67d317e local |
102 cat of |
126 cat of |
103 $ hg cat of |
127 $ hg cat of --rev tip |
104 r11 |
|
105 cat af |
|
106 $ hg cat af |
|
107 r0 |
|
108 r1 |
|
109 r5 |
|
110 r6 |
|
111 r7 |
|
112 r8 |
|
113 r9 |
|
114 r10 |
|
115 r11 |
128 r11 |
116 $ cd .. |
129 $ cd .. |
|
130 |
117 |
131 |
118 new and mergeable files |
132 new and mergeable files |
119 |
133 |
120 $ rm -rf repo |
134 $ rm -rf repo |
121 $ hg init repo |
135 $ hg init repo |
127 +3:p2 |
141 +3:p2 |
128 @temp*f+3 |
142 @temp*f+3 |
129 @default*/p2+2:tip |
143 @default*/p2+2:tip |
130 tip |
144 tip |
131 $ hg id |
145 $ hg id |
132 9c5ce9b70771 tip |
146 000000000000 |
133 glog |
147 glog |
134 $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n' |
148 $ hg glog --template '{rev}: {desc} [{branches}] @ {date}\n' |
135 @ 11: r11 [] @ 11.00 |
149 o 11: r11 [] @ 11.00 |
136 | |
150 | |
137 o 10: r10 [] @ 10.00 |
151 o 10: r10 [] @ 10.00 |
138 | |
152 | |
139 o 9: r9 [] @ 9.00 |
153 o 9: r9 [] @ 9.00 |
140 |\ |
154 |\ |
156 | |
170 | |
157 o 0: r0 [] @ 0.00 |
171 o 0: r0 [] @ 0.00 |
158 |
172 |
159 glog mf |
173 glog mf |
160 $ hg glog --template '{rev}: {desc} [{branches}]\n' mf |
174 $ hg glog --template '{rev}: {desc} [{branches}]\n' mf |
161 @ 11: r11 [] |
175 o 11: r11 [] |
162 | |
176 | |
163 o 10: r10 [] |
177 o 10: r10 [] |
164 | |
178 | |
165 o 9: r9 [] |
179 o 9: r9 [] |
166 |\ |
180 |\ |
251 20 |
265 20 |
252 21 |
266 21 |
253 22 |
267 22 |
254 23 |
268 23 |
255 man |
269 man |
256 $ hg manifest |
270 $ hg manifest --rev tip |
257 mf |
271 mf |
258 nf0 |
272 nf0 |
259 nf1 |
273 nf1 |
260 nf10 |
274 nf10 |
261 nf11 |
275 nf11 |
266 nf6 |
280 nf6 |
267 nf7 |
281 nf7 |
268 nf8 |
282 nf8 |
269 nf9 |
283 nf9 |
270 cat mf |
284 cat mf |
271 $ hg cat mf |
285 $ hg cat mf --rev tip |
272 0 r0 |
286 0 r0 |
273 1 |
287 1 |
274 2 r1 |
288 2 r1 |
275 3 |
289 3 |
276 4 r2 |
290 4 r2 |
293 21 |
307 21 |
294 22 r11 |
308 22 r11 |
295 23 |
309 23 |
296 $ cd .. |
310 $ cd .. |
297 |
311 |
298 command |
312 |
299 |
313 |
300 $ rm -rf repo |
|
301 $ hg init repo |
|
302 $ cd repo |
|
303 $ hg debugbuilddag '+2 !"touch X" +2' -q -o |
|
304 dag |
|
305 $ hg debugdag -t -b |
|
306 +4:tip |
|
307 glog |
|
308 $ hg glog --template '{rev}: {desc} [{branches}]\n' |
|
309 @ 3: r3 [] |
|
310 | |
|
311 o 2: r2 [] |
|
312 | |
|
313 o 1: r1 [] |
|
314 | |
|
315 o 0: r0 [] |
|
316 |
|
317 glog X |
|
318 $ hg glog --template '{rev}: {desc} [{branches}]\n' X |
|
319 o 2: r2 [] |
|
320 | |
|
321 $ cd .. |
|