Mercurial > evolve
view tests/test-push-checkheads-partial-C1.t @ 6216:ce46b853d10e
prune: add a test to demonstrate a bug
Test shows that pruning without any successor warns about creating
divergence which is not possible and is a false warning.
For the knowledge, this pattern of pruning (without any successor) an
already pruned cset is sometime used to keep successors locally but
vanish them at server side.
author | Sushil khanchi <sushilkhanchi97@gmail.com> |
---|---|
date | Fri, 23 Jul 2021 00:48:50 +0530 |
parents | 144d10e74757 |
children | c0921b5277a0 fc60328270ac |
line wrap: on
line source
==================================== Testing head checking code: Case C-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 C: checking case were the branch is only partially obsoleted. TestCase 1: 2 changeset branch, only the head is rewritten .. old-state: .. .. * 2 changeset branch .. .. new-state: .. .. * 1 new changesets branches superseding only the head of the old one .. * base of the old branch is still alive .. .. expected-result: .. .. * push denied .. .. graph-summary: .. .. B ø⇠◔ B' .. | | .. A ○ | .. |/ .. ○ $ . $TESTDIR/testlib/push-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 new changesets d73caddc5533 (1 drafts) (run 'hg update' to get a working copy) $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit B1 created new head $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 25c56d33e4c4 (draft): B1 | | x d73caddc5533 (draft): B0 | | | o 8aaa48160adc (draft): A0 |/ o 1e4be0697311 (public): root Actual testing -------------- $ hg push pushing to $TESTTMP/server searching for changes abort: push creates new remote head 25c56d33e4c4 (merge or see 'hg help push' for details about pushing new heads) [20]