20 $ mkcommit c |
20 $ mkcommit c |
21 $ mkcommit d |
21 $ mkcommit d |
22 $ mkcommit e |
22 $ mkcommit e |
23 $ hg bookmarks BABAR |
23 $ hg bookmarks BABAR |
24 $ hg log -G |
24 $ hg log -G |
25 @ 4:9d206ffc875e[BABAR] (draft) add e |
25 @ 4:9d206ffc875e[BABAR] (/draft) add e |
26 | |
26 | |
27 o 3:47d2a3944de8[] (draft) add d |
27 o 3:47d2a3944de8[] (/draft) add d |
28 | |
28 | |
29 o 2:4538525df7e2[] (draft) add c |
29 o 2:4538525df7e2[] (/draft) add c |
30 | |
30 | |
31 o 1:7c3bad9141dc[] (draft) add b |
31 o 1:7c3bad9141dc[] (/draft) add b |
32 | |
32 | |
33 o 0:1f0dee641bb7[] (public) add a |
33 o 0:1f0dee641bb7[] (/public) add a |
34 |
34 |
35 |
35 |
36 Check arguments exclusive to each other |
36 Check arguments exclusive to each other |
37 --------------------------------------- |
37 --------------------------------------- |
38 |
38 |
110 $ mkcommit nC |
110 $ mkcommit nC |
111 $ mkcommit nD |
111 $ mkcommit nD |
112 $ mkcommit nE |
112 $ mkcommit nE |
113 |
113 |
114 $ hg log -G |
114 $ hg log -G |
115 @ 12:6e8148413dd5[] (draft) add nE |
115 @ 12:6e8148413dd5[] (/draft) add nE |
116 | |
116 | |
117 o 11:8ee176ff1d4b[] (draft) add nD |
117 o 11:8ee176ff1d4b[] (/draft) add nD |
118 | |
118 | |
119 o 10:aa96dc3f04c2[] (draft) add nC |
119 o 10:aa96dc3f04c2[] (/draft) add nC |
120 | |
120 | |
121 o 9:6f6f25e4f748[] (draft) add nB |
121 o 9:6f6f25e4f748[] (/draft) add nB |
122 | |
122 | |
123 | o 8:bb5e90a7ea1f[] (draft) add ee |
123 | o 8:bb5e90a7ea1f[] (/draft) add ee |
124 | | |
124 | | |
125 | o 7:00ded550b1e2[] (draft) add dd |
125 | o 7:00ded550b1e2[] (/draft) add dd |
126 | | |
126 | | |
127 | o 6:354011cd103f[] (draft) add cc |
127 | o 6:354011cd103f[] (/draft) add cc |
128 | | |
128 | | |
129 | o 5:814c38b95e72[] (draft) add bb |
129 | o 5:814c38b95e72[] (/draft) add bb |
130 |/ |
130 |/ |
131 o 0:1f0dee641bb7[BABAR] (public) add a |
131 o 0:1f0dee641bb7[BABAR] (/public) add a |
132 |
132 |
133 |
133 |
134 one old, one new |
134 one old, one new |
135 |
135 |
136 $ hg up 'desc("add ee")' |
136 $ hg up 'desc("add ee")' |
144 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'user': 'test'} (glob) |
144 7c3bad9141dcb46ff89abf5f61856facd56e476c 0 {1f0dee641bb7258c56bd60e93edfa2405381c41e} (*) {'user': 'test'} (glob) |
145 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'user': 'test'} (glob) |
145 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'user': 'test'} (glob) |
146 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'user': 'test'} (glob) |
146 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'user': 'test'} (glob) |
147 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'user': 'test'} (glob) |
147 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'user': 'test'} (glob) |
148 $ hg log -G |
148 $ hg log -G |
149 @ 12:6e8148413dd5[] (draft) add nE |
149 @ 12:6e8148413dd5[] (/draft) add nE |
150 | |
150 | |
151 o 11:8ee176ff1d4b[] (draft) add nD |
151 o 11:8ee176ff1d4b[] (/draft) add nD |
152 | |
152 | |
153 o 10:aa96dc3f04c2[] (draft) add nC |
153 o 10:aa96dc3f04c2[] (/draft) add nC |
154 | |
154 | |
155 o 9:6f6f25e4f748[] (draft) add nB |
155 o 9:6f6f25e4f748[] (/draft) add nB |
156 | |
156 | |
157 | o 7:00ded550b1e2[] (draft) add dd |
157 | o 7:00ded550b1e2[] (/draft) add dd |
158 | | |
158 | | |
159 | o 6:354011cd103f[] (draft) add cc |
159 | o 6:354011cd103f[] (/draft) add cc |
160 | | |
160 | | |
161 | o 5:814c38b95e72[] (draft) add bb |
161 | o 5:814c38b95e72[] (/draft) add bb |
162 |/ |
162 |/ |
163 o 0:1f0dee641bb7[BABAR] (public) add a |
163 o 0:1f0dee641bb7[BABAR] (/public) add a |
164 |
164 |
165 |
165 |
166 one old, two new |
166 one old, two new |
167 |
167 |
168 $ hg prune 'desc("add dd")' -s 'desc("add nD")' -s 'desc("add nC")' |
168 $ hg prune 'desc("add dd")' -s 'desc("add nD")' -s 'desc("add nC")' |
176 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'user': 'test'} (glob) |
176 4538525df7e2b9f09423636c61ef63a4cb872a2d 0 {7c3bad9141dcb46ff89abf5f61856facd56e476c} (*) {'user': 'test'} (glob) |
177 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'user': 'test'} (glob) |
177 47d2a3944de8b013de3be9578e8e344ea2e6c097 0 {4538525df7e2b9f09423636c61ef63a4cb872a2d} (*) {'user': 'test'} (glob) |
178 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'user': 'test'} (glob) |
178 bb5e90a7ea1f3b4b38b23150a4a597b6146d70ef 6e8148413dd541855b72a920a90c06fca127c7e7 0 (*) {'user': 'test'} (glob) |
179 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'user': 'test'} (glob) |
179 00ded550b1e28bba454bd34cec1269d22cf3ef25 aa96dc3f04c2c2341fe6880aeb6dc9fbffff9ef9 8ee176ff1d4b2034ce51e3efc579c2de346b631d 0 (*) {'user': 'test'} (glob) |
180 $ hg log -G |
180 $ hg log -G |
181 @ 12:6e8148413dd5[] (draft) add nE |
181 @ 12:6e8148413dd5[] (/draft) add nE |
182 | |
182 | |
183 o 11:8ee176ff1d4b[] (draft) add nD |
183 o 11:8ee176ff1d4b[] (/draft) add nD |
184 | |
184 | |
185 o 10:aa96dc3f04c2[] (draft) add nC |
185 o 10:aa96dc3f04c2[] (/draft) add nC |
186 | |
186 | |
187 o 9:6f6f25e4f748[] (draft) add nB |
187 o 9:6f6f25e4f748[] (/draft) add nB |
188 | |
188 | |
189 | o 6:354011cd103f[] (draft) add cc |
189 | o 6:354011cd103f[] (/draft) add cc |
190 | | |
190 | | |
191 | o 5:814c38b95e72[] (draft) add bb |
191 | o 5:814c38b95e72[] (/draft) add bb |
192 |/ |
192 |/ |
193 o 0:1f0dee641bb7[BABAR] (public) add a |
193 o 0:1f0dee641bb7[BABAR] (/public) add a |
194 |
194 |
195 |
195 |
196 two old, two new (should be denied) |
196 two old, two new (should be denied) |
197 |
197 |
198 $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nD")' -s 'desc("add nC")' |
198 $ hg prune 'desc("add cc")' 'desc("add bb")' -s 'desc("add nD")' -s 'desc("add nC")' |
374 $ hg up 10 |
374 $ hg up 10 |
375 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
375 0 files updated, 0 files merged, 1 files removed, 0 files unresolved |
376 (leaving bookmark rg) |
376 (leaving bookmark rg) |
377 $ hg bookmark r10 |
377 $ hg bookmark r10 |
378 $ hg log -G |
378 $ hg log -G |
379 o 15:cd0038e05e1b[rg] (draft) add rg |
379 o 15:cd0038e05e1b[rg] (/draft) add rg |
380 | |
380 | |
381 | x 14:43227190fef8[] (obsolete/draft) r14 |
381 | x 14:43227190fef8[] (obsolete/draft) r14 |
382 | | |
382 | | |
383 | | x 13:b4594d867745[] (obsolete/draft) r13 |
383 | | x 13:b4594d867745[] (obsolete/draft) r13 |
384 | | | |
384 | | | |
385 | | | x 12:e46a4836065c[] (obsolete/draft) r12 |
385 | | | x 12:e46a4836065c[] (obsolete/draft) r12 |
386 | | |/ |
386 | | |/ |
387 | | o 11:bab5d5bf48bd[] (draft) r11 |
387 | | o 11:bab5d5bf48bd[] (/draft) r11 |
388 | |/ |
388 | |/ |
389 +---@ 10:ff43616e5d0f[B r10] (draft) r10 |
389 +---@ 10:ff43616e5d0f[B r10] (/draft) r10 |
390 | | |
390 | | |
391 o | 8:d62d843c9a01[] (draft) r8 |
391 o | 8:d62d843c9a01[] (/draft) r8 |
392 | | |
392 | | |
393 o | 7:e7d9710d9fc6[] (draft) r7 |
393 o | 7:e7d9710d9fc6[] (/draft) r7 |
394 |/ |
394 |/ |
395 o 3:2b6d669947cd[] (draft) r3 |
395 o 3:2b6d669947cd[] (/draft) r3 |
396 |\ |
396 |\ |
397 | o 2:fa942426a6fd[] (draft) r2 |
397 | o 2:fa942426a6fd[] (/draft) r2 |
398 | | |
398 | | |
399 o | 1:66f7d451a68b[] (draft) r1 |
399 o | 1:66f7d451a68b[] (/draft) r1 |
400 |/ |
400 |/ |
401 o 0:1ea73414a91b[] (draft) r0 |
401 o 0:1ea73414a91b[] (/draft) r0 |
402 |
402 |
403 $ hg prune 11 |
403 $ hg prune 11 |
404 1 changesets pruned |
404 1 changesets pruned |
405 $ hg log -G |
405 $ hg log -G |
406 o 15:cd0038e05e1b[rg] (draft) add rg |
406 o 15:cd0038e05e1b[rg] (/draft) add rg |
407 | |
407 | |
408 | x 14:43227190fef8[] (obsolete/draft) r14 |
408 | x 14:43227190fef8[] (obsolete/draft) r14 |
409 | | |
409 | | |
410 | | x 13:b4594d867745[] (obsolete/draft) r13 |
410 | | x 13:b4594d867745[] (obsolete/draft) r13 |
411 | | | |
411 | | | |
412 | | | x 12:e46a4836065c[] (obsolete/draft) r12 |
412 | | | x 12:e46a4836065c[] (obsolete/draft) r12 |
413 | | |/ |
413 | | |/ |
414 | | x 11:bab5d5bf48bd[] (obsolete/draft) r11 |
414 | | x 11:bab5d5bf48bd[] (obsolete/draft) r11 |
415 | |/ |
415 | |/ |
416 +---@ 10:ff43616e5d0f[B r10] (draft) r10 |
416 +---@ 10:ff43616e5d0f[B r10] (/draft) r10 |
417 | | |
417 | | |
418 o | 8:d62d843c9a01[] (draft) r8 |
418 o | 8:d62d843c9a01[] (/draft) r8 |
419 | | |
419 | | |
420 o | 7:e7d9710d9fc6[] (draft) r7 |
420 o | 7:e7d9710d9fc6[] (/draft) r7 |
421 |/ |
421 |/ |
422 o 3:2b6d669947cd[] (draft) r3 |
422 o 3:2b6d669947cd[] (/draft) r3 |
423 |\ |
423 |\ |
424 | o 2:fa942426a6fd[] (draft) r2 |
424 | o 2:fa942426a6fd[] (/draft) r2 |
425 | | |
425 | | |
426 o | 1:66f7d451a68b[] (draft) r1 |
426 o | 1:66f7d451a68b[] (/draft) r1 |
427 |/ |
427 |/ |
428 o 0:1ea73414a91b[] (draft) r0 |
428 o 0:1ea73414a91b[] (/draft) r0 |
429 |
429 |
430 $ hg book CELESTE |
430 $ hg book CELESTE |
431 $ hg prune -r . --keep |
431 $ hg prune -r . --keep |
432 1 changesets pruned |
432 1 changesets pruned |
433 $ hg book |
433 $ hg book |