diff -r 3e339f6717c7 -r 347849e17876 tests/test-exchange-B6.t --- a/tests/test-exchange-B6.t Fri Mar 31 15:44:10 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,111 +0,0 @@ - - - - -Initial setup - - $ . $TESTDIR/testlib/exchange-util.sh - -== B.6 Pruned changeset with ancestors not in pushed set === - -.. {{{ -.. B ø⇠⊗ B' -.. | | -.. A ○ | -.. |/ -.. ● O -.. }}} -.. -.. Marker exist from: -.. -.. * `Bø⇠⊗ B'` -.. * B' prune -.. -.. Command run: -.. -.. * hg push -r O -.. -.. Expected exchange: -.. -.. * `Bø⇠⊗ B'` -.. * B' prune - - $ setuprepos B.6 - creating test repo for test case B.6 - - pulldest - - main - - pushdest - cd into `main` and proceed with env setup - $ cd main - $ mkcommit A - $ mkcommit B0 - $ hg up --quiet 0 - $ mkcommit B1 - created new head - $ hg debugobsolete `getid 'desc(B0)'` `getid 'desc(B1)'` - $ hg prune -qd '0 0' . - $ hg log -G --hidden - x f6298a8ac3a4 (draft): B1 - | - | x 962ecf6b1afc (draft): B0 - | | - | o f5bc6836db60 (draft): A - |/ - @ a9bdc8b26820 (public): O - - $ hg debugobsolete - 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - $ hg debugobsrelsethashtree - a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04 86e41541149f4b6cccc5fd131d744d8e83a681e5 - f5bc6836db60e308a17ba08bf050154ba9c4fad7 f2e05412d3f1d5bc1ae647cf9efc43e0399c26ca - 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b 974507d1c466d0aa86d288836194339ed3b98736 - f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 04e03a8959d8a39984e6a8f4a16fba975b364747 - $ hg debugobshashrange --subranges --rev 'head()' - rev node index size depth obshash - 1 f5bc6836db60 0 2 2 000000000000 - 0 a9bdc8b26820 0 1 1 86e41541149f - 1 f5bc6836db60 1 1 2 000000000000 - $ cd .. - $ cd .. - -Actual Test -------------------------------------- - - $ dotest B.6 O - ## Running testcase B.6 - # testing echange of "O" (a9bdc8b26820) - ## initial state - # obstore: main - 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 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: 2 new obsolescence markers - ## post push state - # obstore: main - 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - # obstore: pushdest - 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 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 - 2 new obsolescence markers - ## post pull state - # obstore: main - 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - # obstore: pushdest - 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - # obstore: pulldest - 962ecf6b1afc94e15c7e48fdfb76ef8abd11372b f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} - f6298a8ac3a4b78bbeae5f1d3dc5bc3c3812f0f3 0 {a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04} (Thu Jan 01 00:00:00 1970 +0000) {'user': 'test'} -