diff -r 3e339f6717c7 -r 347849e17876 tests/test-exchange-B4.t --- a/tests/test-exchange-B4.t Fri Mar 31 15:44:10 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,155 +0,0 @@ - -Initial setup - - $ . $TESTDIR/testlib/exchange-util.sh - -=== B.4 Pruned changeset on common part of history === - -.. {{{ -.. ⊗ C -.. | ● B -.. | | -.. | ● A -.. |/ -.. ● O -.. }}} -.. -.. Marker exist from: -.. -.. * C (prune) -.. -.. Command run: -.. -.. * hg push -r B -.. * hg push -.. -.. Expected exchange: -.. -.. * prune for C - - - $ setuprepos B.4 - creating test repo for test case B.4 - - pulldest - - main - - pushdest - cd into `main` and proceed with env setup - $ cd main - $ mkcommit A - $ mkcommit B - $ hg phase --public . - $ hg push ../pushdest - pushing to ../pushdest - searching for changes - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 2 changesets with 2 changes to 2 files - $ hg push ../pulldest - pushing to ../pulldest - searching for changes - remote: adding changesets - remote: adding manifests - remote: adding file changes - remote: added 2 changesets with 2 changes to 2 files - $ hg update -q 0 - $ mkcommit C - created new head - $ hg prune -qd '0 0' . - $ hg log -G --hidden - x 7f7f229b13a6 (draft): C - | - | o f6fbb35d8ac9 (public): B - | | - | o f5bc6836db60 (public): A - |/ - @ a9bdc8b26820 (public): O - - $ hg debugobsolete - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - $ hg debugobsrelsethashtree - a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 1900882e85db10a1dc5bc7748f436a8a834356c6 - f5bc6836db60e308a17ba08bf050154ba9c4fad7 c27e764c783f451ef3aa40daf2a3795e6674cd06 - f6fbb35d8ac958bbe70035e4c789c18471cdc0af 907beff79fdff2b82b5d3bed7989107a6d744508 - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed c27e764c783f451ef3aa40daf2a3795e6674cd06 - $ hg debugobshashrange --subranges --rev 'head()' - rev node index size depth obshash - 2 f6fbb35d8ac9 0 3 3 000000000000 - 1 f5bc6836db60 0 2 2 000000000000 - 0 a9bdc8b26820 0 1 1 1900882e85db - 1 f5bc6836db60 1 1 2 000000000000 - 2 f6fbb35d8ac9 2 1 3 000000000000 - $ cd .. - $ cd .. - - - $ cp -r B.4 B.4.a - $ cp -r B.4 B.4.b - -Actual Test (explicit push version) ------------------------------------ - - $ dotest B.4.a O - ## Running testcase B.4.a - # testing echange of "O" (a9bdc8b26820) - ## initial state - # obstore: main - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - # obstore: pushdest - # obstore: pulldest - ## pushing "O" from main to pushdest - pushing to pushdest - searching for changes - no changes found - remote: 1 new obsolescence markers - ## post push state - # obstore: main - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - # obstore: pushdest - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - # obstore: pulldest - ## pulling "a9bdc8b26820" from main into pulldest - pulling from main - no changes found - 1 new obsolescence markers - ## post pull state - # obstore: main - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - # obstore: pushdest - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - # obstore: pulldest - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - -Actual Test (bare push version) ------------------------------------ - - $ dotest B.4.b - ## Running testcase B.4.b - ## initial state - # obstore: main - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - # obstore: pushdest - # obstore: pulldest - ## pushing from main to pushdest - pushing to pushdest - searching for changes - no changes found - remote: 1 new obsolescence markers - ## post push state - # obstore: main - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - # obstore: pushdest - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - # obstore: pulldest - ## pulling from main into pulldest - pulling from main - searching for changes - no changes found - 1 new obsolescence markers - ## post pull state - # obstore: main - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - # obstore: pushdest - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - # obstore: pulldest - 7f7f229b13a629a5b20581c6cb723f4e2ca54bed 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'}