##// END OF EJS Templates
filemerge: add configs to disable some or all partial merge tools...
filemerge: add configs to disable some or all partial merge tools When rolling out partial merge tools to users, it's useful to be able to easily turn one or all of them off if a problem is discovered. This patch adds support for that. They can of course also be useful for individual users to be able to temporarily turn off a tool they are otherwise using. Differential Revision: https://phab.mercurial-scm.org/D12588

File last commit:

r43163:34a46d48 default
r50060:7af798e4 default
Show More
test-push-checkheads-superceed-A5.t
78 lines | 1.7 KiB | text/troff | Tads3Lexer
/ tests / test-push-checkheads-superceed-A5.t
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case A5...
r31978 ====================================
Testing head checking code: Case A-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 A: simple case involving a branch being superceeded by another.
TestCase 5: New changeset as parent of the successor
.. old-state:
..
.. * 1-changeset branch
..
.. new-state:
..
.. * 2rchangeset branch, head is a successor, but other is new
..
.. expected-result:
..
.. * push allowed
..
.. graph-summary:
..
.. A ø⇠◔ A'
.. | |
.. | ◔ B
.. |/
.. ●
$ . $TESTDIR/testlib/push-checkheads-util.sh
Test setup
----------
$ mkdir A5
$ cd A5
$ 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
$ mkcommit A1
$ hg debugobsolete `getid "desc(A0)" ` `getid "desc(A1)"`
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 A5...
r31978 $ hg log -G --hidden
@ ba93660aff8d (draft): A1
|
o 74ff5441d343 (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/A5/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case A5...
r31978 searching for changes
adding changesets
adding manifests
adding file changes
added 2 changesets with 2 changes to 2 files (+1 heads)
1 new obsolescence markers
obsolete: reports the number of local changeset obsoleted when unbundling...
r33249 obsoleted 1 changesets
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case A5...
r31978
$ cd ../..