Mercurial > hg
view tests/test-push-checkheads-superceed-A7.t @ 44311:2b72c4ff8ed1
nodemap: use an intermediate "docket" file to carry small metadata
This intermediate file will make mmapping, transaction and content validation
easier. (Most of this usefulness will arrive gradually in later changeset). In
particular it will become very useful to append new data are the end of raw file
instead of rewriting on the file on each transaction.
See in code comments for details.
Differential Revision: https://phab.mercurial-scm.org/D7838
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Wed, 15 Jan 2020 15:47:50 +0100 |
parents | 34a46d48d24e |
children | 5996640fc6fe |
line wrap: on
line source
==================================== Testing head checking code: Case A-7 ==================================== Mercurial checks for the introduction of new heads on push. Evolution comes into play to detect if existing branches on the server are being replaced by some of the new one we push. This case is part of a series of tests checking this behavior. Category A: simple case involving a branch being superceeded by another. TestCase 7: multi-changeset branch, split on multiple other, (head on its own branch), same number of head .. old-state: .. .. * 2 branch (1-changeset, and 2-changesets) .. .. new-state: .. .. * 1 new branch superceeding the head of the old-2-changesets-branch, .. * 1 new changesets on the old-1-changeset-branch superceeding the base of the other .. .. expected-result: .. .. * push allowed .. .. graph-summary: .. .. B ø⇠◔ B' .. | | .. A'◔⇢ø | .. | |/ .. C ● | .. \| .. ● $ . $TESTDIR/testlib/push-checkheads-util.sh Test setup ---------- $ mkdir A7 $ cd A7 $ 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 $ hg up 0 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ mkcommit C0 created new head $ cd ../client $ hg pull pulling from $TESTTMP/A7/server searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) new changesets d73caddc5533:0f88766e02d6 (2 drafts) (run 'hg heads' to see heads, 'hg merge' to merge) $ hg up 'desc(C0)' 1 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit A1 $ hg up 0 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ mkcommit B1 created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 25c56d33e4c4 (draft): B1 | | o a0802eb7fc1b (draft): A1 | | | o 0f88766e02d6 (draft): C0 |/ | x d73caddc5533 (draft): B0 | | | x 8aaa48160adc (draft): A0 |/ o 1e4be0697311 (public): root Actual testing -------------- $ hg push pushing to $TESTTMP/A7/server searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files (+1 heads) 2 new obsolescence markers obsoleted 2 changesets $ cd ../..