Mercurial > evolve
view tests/test-exchange-B2.t @ 890:7de15cfd79f7
evolve: abort when trying to move a node on top of itself
This provides a clearer error message when evolve misstakenly tries
to move a changeset on top of itself. Before we got an abort with a
cryptic message about trying to rebase a merge changeset.
A proper fix to make sure that evolve never tries to move a node on
top of itself will come in later patches.
author | Olle Lundberg <geek@nerd.sh> |
---|---|
date | Wed, 26 Mar 2014 00:38:14 +0100 |
parents | b4087501d6a5 |
children | 010c7e4aa820 |
line wrap: on
line source
Initial setup $ . $TESTDIR/_exc-util.sh === B.2 Pruned changeset on head. nothing pushed === .. {{{ .. ⊗ A .. | .. ● O .. }}} .. .. Marker exist from: .. .. * A (prune) .. .. Command run: .. .. * hg push -r O .. * hg push .. .. Expected exchange: .. .. * prune marker for A $ setuprepos B.2 creating test repo for test case B.2 - pulldest - main - pushdest cd into `main` and proceed with env setup $ cd main $ mkcommit A $ hg prune -qd '0 0' . $ hg log -G --hidden x f5bc6836db60 (draft): A | @ a9bdc8b26820 (public): O $ hg debugobsolete f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} $ cd .. $ cd .. $ cp -r B.2 B.2.a $ cp -r B.2 B.2.b Actual Test (explicite push version) ----------------------------------- $ dotest B.2.a O ## Running testcase B.2.a # testing echange of "O" (a9bdc8b26820) ## initial state # obstore: main f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pushdest # obstore: pulldest ## pushing "O" from main to pushdest pushing to pushdest searching for changes no changes found OBSEXC: computing relevant nodes OBSEXC: computing markers relevant to 1 nodes OBSEXC: encoding 1 markers OBSEXC: sending 1 pushkey payload (112 bytes) OBSEXC: DONE ## post push state # obstore: main f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pushdest f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pulldest ## pulling "a9bdc8b26820" from main into pulldest pulling from main no changes found OBSEXC: pull obsolescence markers OBSEXC: merging obsolescence markers (89 bytes) OBSEXC: 1 markers added OBSEXC: DONE ## post pull state # obstore: main f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pushdest f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pulldest f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} Actual Test (bare push version) ----------------------------------- $ dotest B.2.b ## Running testcase B.2.b ## initial state # obstore: main f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pushdest # obstore: pulldest ## pushing from main to pushdest pushing to pushdest searching for changes no changes found OBSEXC: computing relevant nodes OBSEXC: computing markers relevant to 1 nodes OBSEXC: encoding 1 markers OBSEXC: sending 1 pushkey payload (112 bytes) OBSEXC: DONE ## post push state # obstore: main f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pushdest f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pulldest ## pulling from main into pulldest pulling from main searching for changes no changes found OBSEXC: pull obsolescence markers OBSEXC: merging obsolescence markers (89 bytes) OBSEXC: 1 markers added OBSEXC: DONE ## post pull state # obstore: main f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pushdest f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'} # obstore: pulldest f5bc6836db60e308a17ba08bf050154ba9c4fad7 0 {'date': '0 0', 'p1': 'a9bdc8b26820b1b87d585b82eb0ceb4a2ecdbc04', 'user': 'test'}