64 | |
64 | |
65 o 0 1ea73414a91b r0 |
65 o 0 1ea73414a91b r0 |
66 |
66 |
67 |
67 |
68 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(r1)'` |
68 $ hg debugobsolete aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa `getid 'desc(r1)'` |
69 1 new obsolescence markers |
|
70 $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(r2)'` --config experimental.obshashrange.max-revs=1 |
69 $ hg debugobsolete bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb `getid 'desc(r2)'` --config experimental.obshashrange.max-revs=1 |
71 1 new obsolescence markers |
|
72 $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc `getid 'desc(r4)'` |
70 $ hg debugobsolete cccccccccccccccccccccccccccccccccccccccc `getid 'desc(r4)'` |
73 1 new obsolescence markers |
|
74 $ hg debugobsolete dddddddddddddddddddddddddddddddddddddddd `getid 'desc(r5)'` --config experimental.obshashrange.warm-cache=0 |
71 $ hg debugobsolete dddddddddddddddddddddddddddddddddddddddd `getid 'desc(r5)'` --config experimental.obshashrange.warm-cache=0 |
75 1 new obsolescence markers |
|
76 $ hg debugobsolete eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee `getid 'desc(r7)'` |
72 $ hg debugobsolete eeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeeee `getid 'desc(r7)'` |
77 1 new obsolescence markers |
|
78 $ hg debugobsolete |
73 $ hg debugobsolete |
79 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
74 aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa 66f7d451a68b85ed82ff5fcc254daf50c74144bd 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
80 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
75 bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb 01241442b3c2bf3211e593b549c655ea65b295e3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
81 cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
76 cccccccccccccccccccccccccccccccccccccccc bebd167eb94d257ace0e814aeb98e6972ed2970d 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
82 dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
77 dddddddddddddddddddddddddddddddddddddddd c8d03c1b5e94af74b772900c58259d2e08917735 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} |
186 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
181 0 files updated, 0 files merged, 0 files removed, 0 files unresolved |
187 $ echo foo > foo |
182 $ echo foo > foo |
188 $ hg add foo |
183 $ hg add foo |
189 $ hg commit -m foo |
184 $ hg commit -m foo |
190 $ hg debugobsolete ffffffffffffffffffffffffffffffffffffffff `getid '.'` |
185 $ hg debugobsolete ffffffffffffffffffffffffffffffffffffffff `getid '.'` |
191 1 new obsolescence markers |
|
192 $ hg push -f --debug |
186 $ hg push -f --debug |
193 could not import hgext.hgext3rd.evolve (No module named hgext3rd.evolve): trying hgext3rd.hgext3rd.evolve (?) |
187 could not import hgext.hgext3rd.evolve (No module named hgext3rd.evolve): trying hgext3rd.hgext3rd.evolve (?) |
194 could not import hgext3rd.hgext3rd.evolve (No module named hgext3rd.evolve): trying hgext3rd.evolve (?) |
188 could not import hgext3rd.hgext3rd.evolve (No module named hgext3rd.evolve): trying hgext3rd.evolve (?) |
195 pushing to ssh://user@dummy/server |
189 pushing to ssh://user@dummy/server |
196 running python "*/dummyssh" *user@dummy* *hg -R server serve --stdio* (glob) |
190 running python "*/dummyssh" *user@dummy* *hg -R server serve --stdio* (glob) |
235 bundle2-output-part: "obsmarkers" streamed payload |
229 bundle2-output-part: "obsmarkers" streamed payload |
236 remote: adding changesets |
230 remote: adding changesets |
237 remote: adding manifests |
231 remote: adding manifests |
238 remote: adding file changes |
232 remote: adding file changes |
239 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
233 remote: added 1 changesets with 1 changes to 1 files (+1 heads) |
240 remote: 1 new obsolescence markers |
|
241 bundle2-input-bundle: no-transaction |
234 bundle2-input-bundle: no-transaction |
242 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported |
235 bundle2-input-part: "reply:changegroup" (advisory) (params: 0 advisory) supported |
243 bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported |
236 bundle2-input-part: "reply:obsmarkers" (params: 0 advisory) supported |
244 bundle2-input-bundle: 1 parts total |
237 bundle2-input-bundle: 1 parts total |
245 preparing listkeys for "phases" |
238 preparing listkeys for "phases" |
246 sending listkeys command |
239 sending listkeys command |
247 received listkey for "phases": 58 bytes |
240 received listkey for "phases": 58 bytes |
|
241 remote: 1 new obsolescence markers |
248 $ hg -R ../server blackbox |
242 $ hg -R ../server blackbox |
249 * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio (glob) |
243 * @0000000000000000000000000000000000000000 (*)> -R server serve --stdio (glob) |
250 1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-firstmerge in *.???? seconds (1r) (glob) |
244 1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-firstmerge in *.???? seconds (1r) (glob) |
251 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-depthcache in *.???? seconds (1r) (glob) |
245 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-depthcache in *.???? seconds (1r) (glob) |
252 1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-stablesort in *.???? seconds (1r) (glob) |
246 1970/01/01 00:00:00 * @0000000000000000000000000000000000000000 (*)> updated evo-ext-stablesort in *.???? seconds (1r) (glob) |
276 o 1 66f7d451a68b r1 |
270 o 1 66f7d451a68b r1 |
277 | |
271 | |
278 o 0 1ea73414a91b r0 |
272 o 0 1ea73414a91b r0 |
279 |
273 |
280 $ hg debugobsolete 111111111111111aaaaaaaaa1111111111111111 `getid 'desc(r1)'` |
274 $ hg debugobsolete 111111111111111aaaaaaaaa1111111111111111 `getid 'desc(r1)'` |
281 1 new obsolescence markers |
|
282 $ hg debugobsolete 22222222222222222bbbbbbbbbbbbb2222222222 `getid 'desc(r3)'` |
275 $ hg debugobsolete 22222222222222222bbbbbbbbbbbbb2222222222 `getid 'desc(r3)'` |
283 1 new obsolescence markers |
|
284 $ hg push |
276 $ hg push |
285 pushing to ssh://user@dummy/server |
277 pushing to ssh://user@dummy/server |
286 searching for changes |
278 searching for changes |
287 OBSEXC: computing relevant nodes |
279 OBSEXC: computing relevant nodes |
288 OBSEXC: looking for common markers in 6 nodes |
280 OBSEXC: looking for common markers in 6 nodes |
419 o 1 66f7d451a68b r1 |
411 o 1 66f7d451a68b r1 |
420 | |
412 | |
421 o 0 1ea73414a91b r0 |
413 o 0 1ea73414a91b r0 |
422 |
414 |
423 $ hg -R ../server debugobsolete aaaaaaa11111111aaaaaaaaa1111111111111111 `getid 'desc(r1)'` |
415 $ hg -R ../server debugobsolete aaaaaaa11111111aaaaaaaaa1111111111111111 `getid 'desc(r1)'` |
424 1 new obsolescence markers |
|
425 $ hg -R ../server debugobsolete bbbbbbb2222222222bbbbbbbbbbbbb2222222222 `getid 'desc(r4)'` |
416 $ hg -R ../server debugobsolete bbbbbbb2222222222bbbbbbbbbbbbb2222222222 `getid 'desc(r4)'` |
426 1 new obsolescence markers |
|
427 $ hg pull -r 6 |
417 $ hg pull -r 6 |
428 pulling from ssh://user@dummy/server |
418 pulling from ssh://user@dummy/server |
429 searching for changes |
419 searching for changes |
430 OBSEXC: looking for common markers in 6 nodes |
420 OBSEXC: looking for common markers in 6 nodes |
431 OBSEXC: request obsmarkers for 2 common nodes |
421 OBSEXC: request obsmarkers for 2 common nodes |
515 1 66f7d451a68b 1 1 2 853c77a32154 |
505 1 66f7d451a68b 1 1 2 853c77a32154 |
516 4 bebd167eb94d 4 1 5 20a2cc572e4b |
506 4 bebd167eb94d 4 1 5 20a2cc572e4b |
517 6 c8d03c1b5e94 5 1 6 446c2dc3bce5 |
507 6 c8d03c1b5e94 5 1 6 446c2dc3bce5 |
518 7 f69452c5b1af 6 1 7 000000000000 |
508 7 f69452c5b1af 6 1 7 000000000000 |
519 $ hg -R ../server debugobsolete aaaa333333333aaaaa333a3a3a3a3a3a3a3a3a3a `getid 'desc(r1)'` |
509 $ hg -R ../server debugobsolete aaaa333333333aaaaa333a3a3a3a3a3a3a3a3a3a `getid 'desc(r1)'` |
520 1 new obsolescence markers |
|
521 $ hg -R ../server debugobsolete bb4b4b4b4b4b4b4b44b4b4b4b4b4b4b4b4b4b4b4 `getid 'desc(r3)'` |
510 $ hg -R ../server debugobsolete bb4b4b4b4b4b4b4b44b4b4b4b4b4b4b4b4b4b4b4 `getid 'desc(r3)'` |
522 1 new obsolescence markers |
|
523 $ hg pull -r `getid 'desc(r6)'` |
511 $ hg pull -r `getid 'desc(r6)'` |
524 pulling from ssh://user@dummy/server |
512 pulling from ssh://user@dummy/server |
525 no changes found |
513 no changes found |
526 OBSEXC: looking for common markers in 7 nodes |
514 OBSEXC: looking for common markers in 7 nodes |
527 OBSEXC: request obsmarkers for 2 common nodes |
515 OBSEXC: request obsmarkers for 2 common nodes |
598 1 66f7d451a68b 1 1 2 327c7dd73d29 |
586 1 66f7d451a68b 1 1 2 327c7dd73d29 |
599 4 bebd167eb94d 4 1 5 20a2cc572e4b |
587 4 bebd167eb94d 4 1 5 20a2cc572e4b |
600 5 c8d03c1b5e94 5 1 6 446c2dc3bce5 |
588 5 c8d03c1b5e94 5 1 6 446c2dc3bce5 |
601 6 f69452c5b1af 6 1 7 000000000000 |
589 6 f69452c5b1af 6 1 7 000000000000 |
602 $ hg -R ../server debugobsolete --record-parents `getid 'desc(foo)'` |
590 $ hg -R ../server debugobsolete --record-parents `getid 'desc(foo)'` |
603 1 new obsolescence markers |
|
604 $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' |
591 $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' |
605 rev node index size depth obshash |
592 rev node index size depth obshash |
606 7 4de32a90b66c 0 8 8 c7f1f7e9925b |
593 7 4de32a90b66c 0 8 8 c7f1f7e9925b |
607 8 45f8b879de92 0 6 6 7c49a958a9ac |
594 8 45f8b879de92 0 6 6 7c49a958a9ac |
608 3 2dc09a01254d 0 4 4 8932bf980bb4 |
595 3 2dc09a01254d 0 4 4 8932bf980bb4 |
683 1 66f7d451a68b 1 1 2 327c7dd73d29 |
670 1 66f7d451a68b 1 1 2 327c7dd73d29 |
684 4 bebd167eb94d 4 1 5 b21465ecb790 |
671 4 bebd167eb94d 4 1 5 b21465ecb790 |
685 5 c8d03c1b5e94 5 1 6 446c2dc3bce5 |
672 5 c8d03c1b5e94 5 1 6 446c2dc3bce5 |
686 6 f69452c5b1af 6 1 7 000000000000 |
673 6 f69452c5b1af 6 1 7 000000000000 |
687 $ hg -R ../server debugobsolete --record-parents `(cd ../server/; getid 'desc("chain_prune")')` |
674 $ hg -R ../server debugobsolete --record-parents `(cd ../server/; getid 'desc("chain_prune")')` |
688 1 new obsolescence markers |
|
689 obsoleted 1 changesets |
675 obsoleted 1 changesets |
690 $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' |
676 $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' |
691 rev node index size depth obshash |
677 rev node index size depth obshash |
692 7 4de32a90b66c 0 8 8 f966d46c2069 |
678 7 4de32a90b66c 0 8 8 f966d46c2069 |
693 8 45f8b879de92 0 6 6 c9ee11811914 |
679 8 45f8b879de92 0 6 6 c9ee11811914 |
768 7 f69452c5b1af 6 1 7 000000000000 |
754 7 f69452c5b1af 6 1 7 000000000000 |
769 |
755 |
770 New marker prefixed to another one |
756 New marker prefixed to another one |
771 |
757 |
772 $ hg -R ../server debugobsolete aaaa4444444444444444aaaaaaaaaaaaaaaaaaaa `(cd ../server/; getid 'desc("chain_prune")')` |
758 $ hg -R ../server debugobsolete aaaa4444444444444444aaaaaaaaaaaaaaaaaaaa `(cd ../server/; getid 'desc("chain_prune")')` |
773 1 new obsolescence markers |
|
774 $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' |
759 $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' |
775 rev node index size depth obshash |
760 rev node index size depth obshash |
776 7 4de32a90b66c 0 8 8 0ffc0013bda0 |
761 7 4de32a90b66c 0 8 8 0ffc0013bda0 |
777 8 45f8b879de92 0 6 6 0ffa86a0054f |
762 8 45f8b879de92 0 6 6 0ffa86a0054f |
778 3 2dc09a01254d 0 4 4 8932bf980bb4 |
763 3 2dc09a01254d 0 4 4 8932bf980bb4 |
831 7 f69452c5b1af 6 1 7 000000000000 |
816 7 f69452c5b1af 6 1 7 000000000000 |
832 |
817 |
833 New prune marker prefixed to another one |
818 New prune marker prefixed to another one |
834 |
819 |
835 $ hg -R ../server debugobsolete aaaa4444444444444444aaaaaaaaaaaaaaaaaaaa |
820 $ hg -R ../server debugobsolete aaaa4444444444444444aaaaaaaaaaaaaaaaaaaa |
836 1 new obsolescence markers |
|
837 $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' |
821 $ hg debugobshashrange -R ../server --subranges --rev 'heads(all())' |
838 rev node index size depth obshash |
822 rev node index size depth obshash |
839 7 4de32a90b66c 0 8 8 87b2a11bd884 |
823 7 4de32a90b66c 0 8 8 87b2a11bd884 |
840 8 45f8b879de92 0 6 6 fdbbaec33b20 |
824 8 45f8b879de92 0 6 6 fdbbaec33b20 |
841 3 2dc09a01254d 0 4 4 8932bf980bb4 |
825 3 2dc09a01254d 0 4 4 8932bf980bb4 |