##// END OF EJS Templates
upstream » mercurial-mirror
RSS

Clone from https://www.mercurial-scm.org/repo/hg-all

internals: extract frame-based protocol docs to own document...
internals: extract frame-based protocol docs to own document wireprotocol.txt is quite long and difficult to digest. The frame-based protocol is effectively a standalone concept (and could even be used outside of Mercurial). So this commit extracts its docs to a standalone file. The first few paragraphs were rewritten as part of the extraction. Sections headers were adjusted accordingly. Existing referalls in wireprotocol.txt were updated to refer to the new doc / concept, which I've started referring to as `hgrpc`. I'm on the fence as to whether to move the HTTP and SSH transport details to the new doc as well. For now, I'm leaving them in wireprotocol.txt. Differential Revision: https://phab.mercurial-scm.org/D4443
Boris Feld - - Load All Authors

File last commit:

r39516:89630d0b default
r39594:b0e0db15 default
Show More
test-push-checkheads-partial-C3.t
84 lines | 1.8 KiB | text/troff | Tads3Lexer
/ tests / test-push-checkheads-partial-C3.t
History | Source | Raw |Copy content |Copy permalink
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
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 pulling from $TESTTMP/C3/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case C3...
 r31984 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 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
Matt Harbison
tests: remove (glob) annotations that were only for '\' matches...
 r35394 pushing to $TESTTMP/C3/server
Pierre-Yves David
obsolescence: add test for the "branch replacement" logic during push, case C3...
 r31984 searching for changes
abort: push creates new remote head 0f88766e02d6!
(merge or see 'hg help push' for details about pushing new heads)
[255]
$ cd ../..