Mercurial > hg
view tests/test-push-checkheads-unpushed-D1.t @ 48232:f7fd629ffb98
dirstate-v2: Separate HAS_FILE_MTIME and HAS_DIRECTORY_MTIME flags
Previously the same flag was used, with its meaning based on whether the node
otherwise identifies a file tracked anywhere.
In addition to being more explicit, this enables storing a directory mtime
if a given path used to be tracked in a parent commit (so the dirstate still
has data about it) but became a directory in the working copy.
(However this is not done yet as it would require a larger change,
replacing the `dirstate_map::NodeData` enum with struct fields.)
Differential Revision: https://phab.mercurial-scm.org/D11662
author | Simon Sapin <simon.sapin@octobus.net> |
---|---|
date | Thu, 14 Oct 2021 16:39:16 +0200 |
parents | 9261f6c1d39b |
children |
line wrap: on
line source
==================================== Testing head checking code: Case D-1 ==================================== 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 head is rewritten, but successors is not part of the push .. old-state: .. .. * 1 changeset branch .. .. new-state: .. .. * 1 changeset branch succeeding the old branch .. * 1 new unrelated branch .. .. expected-result: .. .. * pushing only the unrelated branch: denied .. .. graph-summary: .. .. A ø⇠○ A' .. |/ .. | ◔ B .. |/ .. ● $ . $TESTDIR/testlib/push-checkheads-util.sh Test setup ---------- $ mkdir D1 $ cd D1 $ 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 debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` 1 new obsolescence markers obsoleted 1 changesets $ hg up 0 0 files updated, 0 files merged, 1 files removed, 0 files unresolved $ mkcommit B0 created new head $ hg log -G --hidden @ 74ff5441d343 (draft): B0 | | o f6082bc4ffef (draft): A1 |/ | x 8aaa48160adc (draft): A0 |/ o 1e4be0697311 (public): root Actual testing -------------- $ hg push -r 'desc(B0)' pushing to $TESTTMP/D1/server searching for changes abort: push creates new remote head 74ff5441d343 (merge or see 'hg help push' for details about pushing new heads) [20] $ cd ../..