##// END OF EJS Templates
merge default into stable for 5.2 release
merge default into stable for 5.2 release

File last commit:

r43163:34a46d48 default
r43600:59338f95 merge 5.2rc0 stable
Show More
test-push-checkheads-pruned-B3.t
93 lines | 2.1 KiB | text/troff | Tads3Lexer
/ tests / test-push-checkheads-pruned-B3.t
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B3...
r31982 ====================================
Testing head checking code: Case B-3
====================================
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 3: multi-changeset branch, other is pruned, rest is superceeded
.. old-state:
..
.. * 2 changeset branch
..
.. new-state:
..
.. * old head is superceeded
.. * old other is pruned
..
.. expected-result:
..
.. * push allowed
..
.. graph-summary:
..
.. B ø⇠◔ B'
.. | |
.. A ⊗ |
.. |/
.. ●
$ . $TESTDIR/testlib/push-checkheads-util.sh
Test setup
----------
$ mkdir B3
$ cd B3
$ 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/B3/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B3...
r31982 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files
Boris Feld
phase: report number of non-public changeset alongside the new range...
r39516 new changesets d73caddc5533 (1 drafts)
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B3...
r31982 (run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit B1
created new head
$ hg debugobsolete --record-parents `getid "desc(A0)"`
debugobsolete: also issue the "new obsmarkers" messsage...
r43163 1 new obsolescence markers
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 B3...
r31982 $ hg debugobsolete `getid "desc(B0)" ` `getid "desc(B1)"`
debugobsolete: also issue the "new obsmarkers" messsage...
r43163 1 new obsolescence markers
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 B3...
r31982 $ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1
|
| 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/B3/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B3...
r31982 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
2 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 B3...
r31982
$ cd ../..