Mercurial > hg
view tests/test-push-checkheads-pruned-B1.t @ 45711:3d68b47e461b
rewriteutil: handle dropped commits when updating description hashes
In looking to leverage this with the absorb extension, the old -> new mapping
there allows the new value to be None. We could filter that out and not pass it
to this method, but it seems worth a message to the user. (I wonder if these
should be an info or warning, because it's unlikely people are using `-v`
regularly.)
Differential Revision: https://phab.mercurial-scm.org/D9181
author | Matt Harbison <matt_harbison@yahoo.com> |
---|---|
date | Thu, 08 Oct 2020 23:33:04 -0400 |
parents | 34a46d48d24e |
children |
line wrap: on
line source
==================================== Testing head checking code: Case B-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 B: simple case involving pruned changesets TestCase 1: single pruned changeset .. old-state: .. .. * 1 changeset branch .. .. new-state: .. .. * old branch is pruned .. * 1 new unrelated branch .. .. expected-result: .. .. * push allowed .. .. graph-summary: .. .. ◔ B .. | .. A ⊗ | .. |/ .. ● $ . $TESTDIR/testlib/push-checkheads-util.sh Test setup ---------- $ mkdir B1 $ cd B1 $ 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 B0 created new head $ hg debugobsolete --record-parents `getid "desc(A0)"` 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 74ff5441d343 (draft): B0 | | x 8aaa48160adc (draft): A0 |/ o 1e4be0697311 (public): root Actual testing -------------- $ hg push pushing to $TESTTMP/B1/server searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files (+1 heads) 1 new obsolescence markers obsoleted 1 changesets $ cd ../..