Mercurial > evolve
view tests/test-push-checkheads-superceed-A8.t @ 5545:56e5dc7d6319
rewind: always compute successorsmap
We have had access to rewind targets (predecessors) in this function before,
but having access to current successors (in the form of successorsmap) is also
useful and will be used in following patches.
We're emptying successorsmap when --as-divergence is given to keep the current
behavior. It's done before using it for --dry-run and actual work.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Tue, 21 Jul 2020 11:23:41 +0800 |
parents | a8ff17479fb8 |
children | f3e39a354378 |
line wrap: on
line source
==================================== Testing head checking code: Case A-8 ==================================== 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 8: single-changeset branch indirect rewrite .. old-state: .. .. * 1-changeset branch .. .. new-state: .. .. * 1-changeset branch succeeding to A, through another unpushed changesets .. .. expected-result: .. .. * push allowed .. .. graph-summary: .. .. A' .. A ø⇠ø⇠◔ A'' .. |/ / .. | / .. |/ .. ● $ . $TESTDIR/testlib/push-checkheads-util.sh Test setup ---------- $ mkdir A8 $ cd A8 $ 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 up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit A2 created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` 1 new obsolescence markers obsoleted 1 changesets $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"` 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ c1f8d089020f (draft): A2 | | x f6082bc4ffef (draft): A1 |/ | x 8aaa48160adc (draft): A0 |/ o 1e4be0697311 (public): root Actual testing -------------- $ hg push pushing to $TESTTMP/A8/server (glob) searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) 2 new obsolescence markers obsoleted 1 changesets $ cd ../..