Mercurial > evolve
view tests/test-checkheads-superceed-A5.t @ 2156:e57f28fafe41
stablerange: make sure nobody use the 'stablekey' property outside the class
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Wed, 22 Mar 2017 17:48:39 +0100 |
parents | e1c26c632b6d |
children |
line wrap: on
line source
==================================== Testing head checking code: Case A-5 ==================================== Mercurial checks for the introduction of multiple heads on push. Evolution comes into play to detect if existing heads on the server are being replaced by some of the new heads we push. This test file is part of a series of tests checking this behavior. Category A: checking simple case invoving a branch being superceeded by another. TestCase 5: New changeset as parent of the successor .. old-state: .. .. * 1 changeset branch .. .. new-state: .. .. * 2 changeset branch, head is a successor, but other is new .. .. expected-result: .. .. * push allowed .. .. graph-summary: .. .. A ø⇠◔ A' .. | | .. | ◔ B .. |/ .. ○ $ . $TESTDIR/testlib/checkheads-util.sh Test setup ---------- $ setuprepos creating basic server and client repo updating to branch default 2 files updated, 0 files merged, 0 files removed, 0 files unresolved $ cd client $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit B0 created new head $ mkcommit A1 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` $ hg log -G --hidden @ ba93660aff8d (draft): A1 | o 74ff5441d343 (draft): B0 | | x 8aaa48160adc (draft): A0 |/ o 1e4be0697311 (public): root Actual testing -------------- $ hg push pushing to $TESTTMP/server searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) 1 new obsolescence markers