comparison tests/test-setdiscovery.t @ 35163:ee64e677c3cf

merge with stable
author Augie Fackler <augie@google.com>
date Thu, 30 Nov 2017 15:48:42 -0500
parents 62e10bf001a9 02845f7441af
children f77121b6bf1b
comparison
equal deleted inserted replaced
35162:bdd2e18b54c5 35163:ee64e677c3cf
15 > echo 15 > echo
16 > echo "% -- a -> b set" 16 > echo "% -- a -> b set"
17 > hg -R a debugdiscovery b --verbose --debug --config progress.debug=true 17 > hg -R a debugdiscovery b --verbose --debug --config progress.debug=true
18 > echo 18 > echo
19 > echo "% -- b -> a tree" 19 > echo "% -- b -> a tree"
20 > hg -R b debugdiscovery a --verbose --old --config 20 > hg -R b debugdiscovery a --verbose --old
21 > echo 21 > echo
22 > echo "% -- b -> a set" 22 > echo "% -- b -> a set"
23 > hg -R b debugdiscovery a --verbose --debug --config progress.debug=true 23 > hg -R b debugdiscovery a --verbose --debug --config progress.debug=true
24 > cd .. 24 > cd ..
25 > } 25 > }
404 comparing with r2 404 comparing with r2
405 searching for changes 405 searching for changes
406 101 102 103 104 105 106 107 108 109 110 (no-eol) 406 101 102 103 104 105 106 107 108 109 110 (no-eol)
407 $ hg -R r1 --config extensions.blackbox= blackbox 407 $ hg -R r1 --config extensions.blackbox= blackbox
408 * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> serve --cmdserver chgunix * (glob) (chg !) 408 * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> serve --cmdserver chgunix * (glob) (chg !)
409 * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> outgoing r2 *-T{rev} * (glob) 409 * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* (glob)
410 * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 unknown server heads, 2 roundtrips in *.????s (glob) 410 * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> found 101 common and 1 unknown server heads, 2 roundtrips in *.????s (glob)
411 * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* exited 0 after *.?? seconds (glob) 411 * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 outgoing r2 *-T{rev} * --config *extensions.blackbox=* exited 0 after *.?? seconds (glob)
412 * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> blackbox (glob) 412 * @5d0b986a083e0d91f116de4691e2aaa54d5bbec0 (*)> -R r1 --config *extensions.blackbox=* blackbox (glob)
413 $ cd .. 413 $ cd ..