##// END OF EJS Templates
util: extract all date-related utils in utils/dateutil module...
util: extract all date-related utils in utils/dateutil module With this commit, util.py lose 262 lines Note for extensions author, if this commit breaks your extension, you can pull the step-by-step split here to help you more easily pinpoint the renaming that broke your extension: hg pull https://bitbucket.org/octobus/mercurial-devel/ -r ac1f6453010d Differential Revision: https://phab.mercurial-scm.org/D2282

File last commit:

r35727:1a09dad8 default
r36625:c6061cad default
Show More
test-push-checkheads-pruned-B5.t
98 lines | 2.2 KiB | text/troff | Tads3Lexer
/ tests / test-push-checkheads-pruned-B5.t
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B5...
r32012 ====================================
Testing head checking code: Case B-5
====================================
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 5: multi-changeset branch, mix of pruned and superceeded
.. old-state:
..
.. * 3 changeset branch
..
.. new-state:
..
.. * old head is pruned
.. * old mid is superceeded
.. * old root is pruned
..
.. expected-result:
..
.. * push allowed
..
.. graph-summary:
..
.. B
.. |
.. A ø⇠◔ A'
.. | |
.. B ⊗ |
.. |/
.. ●
$ . $TESTDIR/testlib/push-checkheads-util.sh
Test setup
----------
$ mkdir B5
$ cd B5
$ 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
$ mkcommit C0
$ cd ../client
$ hg pull
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 pulling from $TESTTMP/B5/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B5...
r32012 searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets d73caddc5533:821fb21d0dd2
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B5...
r32012 (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)"`
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
r33542 obsoleted 1 changesets
Martin von Zweigbergk
evolution: report new unstable changesets...
r35727 2 new orphan changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B5...
r32012 $ 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 B5...
r32012 $ hg debugobsolete --record-parents `getid "desc(C0)"`
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 B5...
r32012 $ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1
|
| x 821fb21d0dd2 (draft): C0
| |
| 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/B5/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B5...
r32012 searching for changes
adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
3 new obsolescence markers
obsolete: reports the number of local changeset obsoleted when unbundling...
r33249 obsoleted 3 changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case B5...
r32012
$ cd ../..