Mercurial > hg
view tests/test-push-checkheads-unpushed-D2.t @ 45050:18f8d3b31baa
rhg: add a limited `rhg root` subcommand
Clap has been choosen for argument parsing for the following reasons:
- it's a wildly used and maintained crate
- it can deal with OS encoding making it suitable for any encoding
- it supports nonambiguous prefix matching as already available in hg
- it will soon allow for structopts-style declarative pattern instead of the
currently used builder pattern
Differential Revision: https://phab.mercurial-scm.org/D8613
author | Antoine Cezar <antoine.cezar@octobus.net> |
---|---|
date | Tue, 07 Jul 2020 14:05:15 +0530 |
parents | 34a46d48d24e |
children | 122f0b59f5f0 |
line wrap: on
line source
==================================== Testing head checking code: Case D-2 ==================================== 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 D: remote head is "obs-affected" locally, but result is not part of the push TestCase 1: remote branch has 2 changes, head is pruned, other is rewritten but result is not pushed .. old-state: .. .. * 1 changeset branch .. .. new-state: .. .. * old head is pruned .. * 1 new branch succeeding to the other changeset in the old branch .. * 1 new unrelated branch .. .. expected-result: .. .. * push allowed .. * pushing only the unrelated branch: denied .. .. graph-summary: .. .. B ⊗ .. | .. A ø⇠○ A' .. |/ .. | ◔ C .. |/ .. ● $ . $TESTDIR/testlib/push-checkheads-util.sh Test setup ---------- $ mkdir D2 $ cd D2 $ 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/D2/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 A1 created new head $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` 1 new obsolescence markers obsoleted 1 changesets 1 new orphan changesets $ hg debugobsolete --record-parents `getid "desc(B0)"` 1 new obsolescence markers obsoleted 1 changesets $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit C0 created new head $ hg log -G --hidden @ 0f88766e02d6 (draft): C0 | | o f6082bc4ffef (draft): A1 |/ | x d73caddc5533 (draft): B0 | | | x 8aaa48160adc (draft): A0 |/ o 1e4be0697311 (public): root Actual testing -------------- $ hg push --rev 'desc(C0)' pushing to $TESTTMP/D2/server searching for changes abort: push creates new remote head 0f88766e02d6! (merge or see 'hg help push' for details about pushing new heads) [255] $ cd ../..