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

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

dispatch: don't show list of commands on bogus command...
dispatch: don't show list of commands on bogus command If a command is ambiguous, you get this: $ hg ve hg: command 've' is ambiguous: verify version [255] If you typo a command, you get this: $ hg comit hg: unknown command 'comit' (did you mean one of commit, incoming, mycommit?) [255] But if you completely mistype a command so it no longer looks like any existing commands, you get a full list of commands. That might be useful the first time you use Mercurial, but after that it's probably more annoying than help, especially if you have the pager enabled and have a short terminal. Let's instead give a short hint telling the user to run `hg help` for more help. Differential Revision: https://phab.mercurial-scm.org/D4024
Denis Laxalde - - Load All Authors

File last commit:

r34662:eb586ed5 default
r38810:81fb4421 default
Show More
test-push-checkheads-partial-C1.t
84 lines | 1.9 KiB | text/troff | Tads3Lexer
/ tests / test-push-checkheads-partial-C1.t
History | Source | Raw |Copy content |Copy permalink
marmoute
tests: add missing 'test-push-checkheads-partial-C1.t'...
 r32330 ====================================
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: checking case were the branch is only partially obsoleted.
TestCase 1: 2 changeset branch, only the head is rewritten
.. old-state:
..
.. * 2 changeset branch
..
.. new-state:
..
.. * 1 new changesets branches superceeding only the head of the old one
.. * base of the old branch is still alive
..
.. expected-result:
..
.. * push denied
..
.. graph-summary:
..
.. B ø⇠◔ B'
.. | |
.. A â—‹ |
.. |/
.. â—‹
$ . $TESTDIR/testlib/push-checkheads-util.sh
Test setup
----------
$ mkdir C1
$ cd C1
$ 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/C1/server
marmoute
tests: add missing 'test-push-checkheads-partial-C1.t'...
 r32330 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
marmoute
tests: add missing 'test-push-checkheads-partial-C1.t'...
 r32330 (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 `getid "desc(B0)" ` `getid "desc(B1)"`
Boris Feld
debugobsolete: also report the number of obsoleted changesets...
 r33542 obsoleted 1 changesets
marmoute
tests: add missing 'test-push-checkheads-partial-C1.t'...
 r32330 $ hg log -G --hidden
@ 25c56d33e4c4 (draft): B1
|
| 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/C1/server
marmoute
tests: add missing 'test-push-checkheads-partial-C1.t'...
 r32330 searching for changes
abort: push creates new remote head 25c56d33e4c4!
(merge or see 'hg help push' for details about pushing new heads)
[255]
$ cd ../..