Mercurial > evolve
view tests/test-exchange-A6.t @ 1042:86bd794f6037
evolve: stop pretending we are pulling markers when we don't
If discovery did not found any unknown marker, we should not display the
"pulling marker" message.
author | Pierre-Yves David <pierre-yves.david@fb.com> |
---|---|
date | Fri, 08 Aug 2014 18:06:08 -0700 |
parents | 640f3280559e |
children | f6e0cfca1bf0 |
line wrap: on
line source
Initial setup $ . $TESTDIR/_exc-util.sh === A.6 between existing changeset === .. {{{ .. A ◕⇠● B .. |/ .. ● O .. }}} .. .. Marker exist from: .. .. * `A◕⇠● B` .. .. Command run: .. .. * hg push -r B .. * hg push .. .. Expected exchange: .. .. * `A◕⇠● B` initial $ setuprepos A.6 creating test repo for test case A.6 - pulldest - main - pushdest cd into `main` and proceed with env setup $ cd main $ mkcommit A0 $ hg update -q 0 $ mkcommit A1 created new head make both changeset known in remote $ hg push -qf ../pushdest $ hg push -qf ../pulldest create a marker after this $ hg debugobsolete `getid 'desc(A0)'` `getid 'desc(A1)'` $ hg log -G --hidden @ e5ea8f9c7314 (draft): A1 | | x 28b51eb45704 (draft): A0 |/ o a9bdc8b26820 (public): O $ hg debugobsolete 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} $ cd .. $ cd .. $ cp -r A.6 A.6.a $ cp -r A.6 A.6.b Actual Test (explicit push version) ----------------------------------- $ dotest A.6.a A1 ## Running testcase A.6.a # testing echange of "A1" (e5ea8f9c7314) ## initial state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} # obstore: pushdest # obstore: pulldest ## pushing "A1" from main to pushdest pushing to pushdest searching for changes no changes found OBSEXC: computing relevant nodes OBSEXC: computing markers relevant to 2 nodes OBSEXC: pushing 1 obsolescence markers (62 bytes) OBSEXC: DONE ## post push state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} # obstore: pushdest 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} # obstore: pulldest ## pulling "e5ea8f9c7314" from main into pulldest pulling from main no changes found OBSEXC: pull obsolescence markers OBSEXC: merging obsolescence markers (62 bytes) OBSEXC: 1 obsolescence markers added OBSEXC: DONE ## post pull state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} # obstore: pushdest 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} # obstore: pulldest 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} Actual Test (bare push version) ------------------------------- $ dotest A.6.b ## Running testcase A.6.b ## initial state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', '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 3 nodes OBSEXC: pushing 1 obsolescence markers (62 bytes) OBSEXC: DONE ## post push state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} # obstore: pushdest 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', '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 (62 bytes) OBSEXC: 1 obsolescence markers added OBSEXC: DONE ## post pull state # obstore: main 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} # obstore: pushdest 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'} # obstore: pulldest 28b51eb45704506b5c603decd6bf7ac5e0f6a52f e5ea8f9c73143125d36658e90ef70c6d2027a5b7 0 {'date': '', 'user': 'test'}