Mercurial > evolve
view tests/test-checkheads-unpushed-D1.t @ 2255:5b33df335b6c
checkheads: add test where the rewrite of the other branch is not direct
This will help testing that our logic is properly transitive.
author | Pierre-Yves David <pierre-yves.david@ens-lyon.org> |
---|---|
date | Fri, 31 Mar 2017 13:47:14 +0200 |
parents | 2b4e2e93b7db |
children |
line wrap: on
line source
==================================== Testing head checking code: Case D-1 ==================================== 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 D: remote head is "obs-affected" locally, but result is not part of the push. TestCase 1: remote head is rewritten, but successors is not part of the push .. old-state: .. .. * 1 changeset branch .. .. new-state: .. .. * 1 changeset branch succeeding the old branch .. * 1 new unrelated branch .. .. expected-result: .. .. * pushing only the unrelated branch: denied .. .. 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 A1 created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit B0 created new head $ hg log -G --hidden @ 74ff5441d343 (draft): B0 | | o f6082bc4ffef (draft): A1 |/ | x 8aaa48160adc (draft): A0 |/ o 1e4be0697311 (public): root Actual testing -------------- $ hg push -r 'desc(B0)' pushing to $TESTTMP/server searching for changes abort: push creates new remote head 74ff5441d343! (merge or see 'hg help push' for details about pushing new heads) [255]