diff -r dad84c052463 -r 080b9384d741 tests/test-checkheads-partial-C4.t --- a/tests/test-checkheads-partial-C4.t Sat Apr 01 12:45:18 2017 +0200 +++ /dev/null Thu Jan 01 00:00:00 1970 +0000 @@ -1,78 +0,0 @@ -==================================== -Testing head checking code: Case C-4 -==================================== - -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 C: checking case were the branch is only partially obsoleted. -TestCase 4: 2 changeset branch, only the base is pruned - -.. old-state: -.. -.. * 2 changeset branch -.. -.. new-state: -.. -.. * old base is pruned -.. * 1 new unrelated branch -.. -.. expected-result: -.. -.. * push denied -.. -.. graph-summary: -.. -.. B ◔ -.. | -.. A ⊗ ◔ C -.. |/ -.. ○ - - $ . $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 server - $ mkcommit B0 - $ cd ../client - $ hg pull - pulling from $TESTTMP/server - searching for changes - adding changesets - adding manifests - adding file changes - added 1 changesets with 1 changes to 1 files - (run 'hg update' to get a working copy) - $ hg up 0 - 0 files updated, 0 files merged, 1 files removed, 0 files unresolved - $ mkcommit C0 - created new head - $ hg debugobsolete --record-parents `getid "desc(A0)"` - $ hg log -G --hidden - @ 0f88766e02d6 (draft): C0 - | - | o d73caddc5533 (draft): B0 - | | - | x 8aaa48160adc (draft): A0 - |/ - o 1e4be0697311 (public): root - - -Actual testing --------------- - - $ hg push --rev 'desc(C0)' - pushing to $TESTTMP/server - searching for changes - abort: push creates new remote head 0f88766e02d6! - (merge or see 'hg help push' for details about pushing new heads) - [255]