##// END OF EJS Templates
tests: use jshint when available to check .js files
tests: use jshint when available to check .js files

File last commit:

r34662:eb586ed5 default
r35034:5d436907 default
Show More
test-push-checkheads-partial-C3.t
84 lines | 1.8 KiB | text/troff | Tads3Lexer
/ tests / test-push-checkheads-partial-C3.t
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case C3...
r31984 ====================================
Testing head checking code: Case C-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 C: case were the branch is only partially obsoleted
TestCase 3: 2 changeset branch, only the head is pruned
.. old-state:
..
.. * 2 changeset branch
..
.. new-state:
..
.. * old head is pruned
.. * 1 new unrelated branch
..
.. expected-result:
..
.. * push denied
..
.. graph-summary:
..
.. B
.. |
.. A C
.. |/
..
$ . $TESTDIR/testlib/push-checkheads-util.sh
Test setup
----------
$ mkdir C3
$ cd C3
$ 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
pulling from $TESTTMP/C3/server (glob)
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 C3...
r31984 (run 'hg update' to get a working copy)
$ hg up 0
0 files updated, 0 files merged, 1 files removed, 0 files unresolved
$ mkcommit C0
created new head
$ hg debugobsolete --record-parents `getid "desc(B0)"`
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 C3...
r31984 $ hg log -G --hidden
@ 0f88766e02d6 (draft): C0
|
| x d73caddc5533 (draft): B0
| |
| o 8aaa48160adc (draft): A0
|/
o 1e4be0697311 (public): root
Actual testing
--------------
$ hg push
pushing to $TESTTMP/C3/server (glob)
searching for changes
abort: push creates new remote head 0f88766e02d6!
(merge or see 'hg help push' for details about pushing new heads)
[255]
$ cd ../..