##// END OF EJS Templates
pullbundle: fix handling of gzip bundlespecs...
pullbundle: fix handling of gzip bundlespecs Differential Revision: https://phab.mercurial-scm.org/D3933

File last commit:

r35727:1a09dad8 default
r38700:7e4a856a default
Show More
test-push-checkheads-pruned-B8.t
105 lines | 2.5 KiB | text/troff | Tads3Lexer
/ tests / test-push-checkheads-pruned-B8.t
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B8...
r32015 ====================================
Testing head checking code: Case B-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 B: simple case involving pruned changesets
TestCase 2: multi-changeset branch, head is pruned, rest is superceeded, through other
.. old-state:
..
.. * 2 changeset branch
..
.. new-state:
..
.. * old head is rewritten then pruned
.. * 1 new branch succeeding to the other changeset in the old branch (through another obsolete branch)
..
.. expected-result:
..
.. * push allowed
..
.. graph-summary:
..
.. B ø⇠⊗ B'
.. | | A'
.. A ø⇠ø⇠◔ A''
.. |/ /
.. | /
.. |/
..
$ . $TESTDIR/testlib/push-checkheads-util.sh
Test setup
----------
$ mkdir B8
$ cd B8
$ 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
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 pulling from $TESTTMP/B8/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B8...
r32015 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets d73caddc5533
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B8...
r32015 (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
$ mkcommit B1
$ hg up 0
0 files updated, 0 files merged, 2 files removed, 0 files unresolved
$ mkcommit A2
created new head
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
r33542 obsoleted 1 changesets
Martin von Zweigbergk
evolution: report new unstable changesets...
r35727 1 new orphan changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B8...
r32015 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
r33542 obsoleted 1 changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B8...
r32015 $ hg debugobsolete --record-parents `getid "desc(B1)"`
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
r33542 obsoleted 1 changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B8...
r32015 $ hg debugobsolete `getid "desc(A1)" ` `getid "desc(A2)"`
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
r33542 obsoleted 1 changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B8...
r32015 $ hg log -G --hidden
@ c1f8d089020f (draft): A2
|
| x 262c8c798096 (draft): B1
| |
| x f6082bc4ffef (draft): A1
|/
| x d73caddc5533 (draft): B0
| |
| x 8aaa48160adc (draft): A0
|/
o 1e4be0697311 (public): root
Actual testing
--------------
$ hg push
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 pushing to $TESTTMP/B8/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B8...
r32015 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
4 new obsolescence markers
obsolete: reports the number of local changeset obsoleted when unbundling...
r33249 obsoleted 2 changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B8...
r32015
$ cd ../..