Mercurial > evolve
view tests/test-push-checkheads-mixed-branch-topic-G2.t @ 6933:7fcf18ea7813 stable
obshashrange: reset the cache if too many ranges need to be deleted
If some old revision gets affected, we might need to reset so many ranges that
resetting the full cache might be faster.
author | Pierre-Yves David <pierre-yves.david@octobus.net> |
---|---|
date | Mon, 04 Nov 2024 12:12:59 +0100 |
parents | 1eb543272657 |
children | b1d010b2e6c4 9da0114a8a02 |
line wrap: on
line source
==================================== Testing head checking code: Case E-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 F: case involving changeset on multiple branch TestCase 2: moving interleaved branch away from each other .. old-state: .. .. * 2-changeset on branch default .. * 1-changeset on topic Z (between the two other) .. .. new-state: .. .. * 2-changeset on branch default, aligned .. * 1-changeset on topic Z (at the same location) .. .. expected-result: .. .. * push allowed .. .. graph-summary: .. .. C ø⇠◔ C' branch default .. | | .. B ◔ | topic Z .. | | .. A ø⇠◔ A' branch default .. |/ .. ● $ . $TESTDIR/testlib/topic_setup.sh $ . $TESTDIR/testlib/push-checkheads-util.sh Test setup ---------- $ mkdir E1 $ cd E1 $ 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 topic Z marked working directory as topic: Z $ mkcommit B0 active topic 'Z' grew its first changeset (see 'hg help topics' for more information) $ hg topic --clear $ mkcommit C0 created new head (consider using topic for lightweight branches. See 'hg help topic') $ hg push pushing to $TESTTMP/E1/server searching for changes adding changesets adding manifests adding file changes added 2 changesets with 2 changes to 2 files $ hg up 0 0 files updated, 0 files merged, 3 files removed, 0 files unresolved $ mkcommit A1 created new head (consider using topic for lightweight branches. See 'hg help topic') $ mkcommit C1 $ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"` 1 new obsolescence markers obsoleted 1 changesets 2 new orphan changesets $ hg debugobsolete `getid "desc(C0)" ` `getid "desc(C1)"` 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 0c76bc104656 [default] (draft): C1 | o f6082bc4ffef [default] (draft): A1 | | x 44759c6d327d [default] (draft): C0 | | | * 35d2f30a8ba4 [default//Z] (draft): B0 | | | x 8aaa48160adc [default] (draft): A0 |/ o 1e4be0697311 [default] (public): root Actual testing -------------- $ hg push -r 'desc("C1")' pushing to $TESTTMP/E1/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 1 new orphan changesets $ cd ../..