##// END OF EJS Templates
merge with stable
merge with stable

File last commit:

r39516:89630d0b default
r41923:062e9ebc merge default
Show More
test-push-checkheads-partial-C2.t
85 lines | 2.0 KiB | text/troff | Tads3Lexer
/ tests / test-push-checkheads-partial-C2.t
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case C2...
r31983 ====================================
Testing head checking code: Case C-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 C: case were the branch is only partially obsoleted
TestCase 2: 2 changeset branch, only the base is rewritten
.. old-state:
..
.. * 2 changeset branch
..
.. new-state:
..
.. * 1 new changesets branches superceeding only the base of the old one
.. * The old branch is still alive (base is obsolete, head is alive)
..
.. expected-result:
..
.. * push denied
..
.. graph-summary:
..
.. B
.. |
.. A ø⇠◔ A'
.. |/
.. ●
$ . $TESTDIR/testlib/push-checkheads-util.sh
Test setup
----------
$ mkdir C2
$ cd C2
$ 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/C2/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case C2...
r31983 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 C2...
r31983 (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
$ 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 C2...
r31983 $ hg log -G --hidden
@ f6082bc4ffef (draft): A1
|
av6
graphlog: add another graph node type, unstable, using character "*" (BC)
r35524 | * d73caddc5533 (draft): B0
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case C2...
r31983 | |
| x 8aaa48160adc (draft): A0
|/
o 1e4be0697311 (public): root
Actual testing
--------------
$ hg push --rev 'desc(A1)'
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
r35394 pushing to $TESTTMP/C2/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case C2...
r31983 searching for changes
abort: push creates new remote head f6082bc4ffef!
(merge or see 'hg help push' for details about pushing new heads)
[255]
$ cd ../..