Mercurial > evolve
view tests/test-push-checkheads-multibranches-E1.t @ 6625:e3cf5f68da1c
rewind: opts is guaranteed to have the required keys, access them directly
This helps pytype see that they aren't optional, and now it no longer complains
that None doesn't have `append` method.
author | Anton Shestakov <av6@dwimlabs.net> |
---|---|
date | Sun, 31 Dec 2023 17:42:02 -0300 |
parents | 60daa7887c49 |
children | b1d010b2e6c4 |
line wrap: on
line source
==================================== Testing head checking code: Case E-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 E: case involving changeset on multiple branch TestCase 8: moving a branch to another location .. old-state: .. .. * 1-changeset on branch default .. * 1-changeset on branch double//slash (above default) .. .. new-state: .. .. * 1-changeset on branch default .. * 1-changeset on branch double//slash (rebased away from A0) .. .. expected-result: .. .. * push allowed .. .. graph-summary: .. .. B ø⇠◔ B' .. | | .. A ◔ | .. |/ .. ● $ . $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 branch double//slash marked working directory as branch double//slash (branches are permanent and global, did you want a bookmark?) $ mkcommit B0 $ hg push --new-branch pushing to $TESTTMP/E1/server searching for changes adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files $ hg up 0 0 files updated, 0 files merged, 2 files removed, 0 files unresolved $ hg branch --force double//slash marked working directory as branch double//slash $ mkcommit B1 created new head (consider using topic for lightweight branches. See 'hg help topic') $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"` 1 new obsolescence markers obsoleted 1 changesets $ hg log -G --hidden @ 7f7cd4ea4626 [double//slash] (draft): B1 | | x 1fd532b11e77 [double//slash] (draft): B0 | | | o 8aaa48160adc [default] (draft): A0 |/ o 1e4be0697311 [default] (public): root Actual testing -------------- $ hg push pushing to $TESTTMP/E1/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 ../..