##// END OF EJS Templates
shelve: directly handle the initial parent alignment...
shelve: directly handle the initial parent alignment Shelve is currently sub-contracting some of its work to the rebase extension. In order to make shelve more independent and flexible we would like shelve to handle the parent alignment directly. After this change, we no longer need to use rebase in shelve. Differential Revision: https://phab.mercurial-scm.org/D3693

File last commit:

r34662:eb586ed5 default
r38637:c829749e default
Show More
test-unrelated-pull.t
46 lines | 900 B | text/troff | Tads3Lexer
/ tests / test-unrelated-pull.t
Martin Geisler
tests: remove redundant mkdir...
r13956 $ hg init a
Adrian Buehlmann
combine tests
r12279 $ cd a
$ echo 123 > a
$ hg add a
$ hg commit -m "a" -u a
$ cd ..
Martin Geisler
tests: remove redundant mkdir...
r13956 $ hg init b
Adrian Buehlmann
combine tests
r12279 $ cd b
$ echo 321 > b
$ hg add b
$ hg commit -m "b" -u b
$ hg pull ../a
pulling from ../a
searching for changes
abort: repository is unrelated
Matt Mackall
tests: add exit codes to unified tests
r12316 [255]
Adrian Buehlmann
combine tests
r12279
$ hg pull -f ../a
pulling from ../a
searching for changes
warning: repository is unrelated
Peter Arrenbrecht
discovery: avoid discovery when local graph is a subset of remote...
r13742 requesting all changes
Adrian Buehlmann
combine tests
r12279 adding changesets
adding manifests
adding file changes
added 1 changesets with 1 changes to 1 files (+1 heads)
Denis Laxalde
transaction-summary: show the range of new revisions upon pull/unbundle (BC)...
r34662 new changesets 9a79c33a9db3
Adrian Buehlmann
combine tests
r12279 (run 'hg heads' to see heads, 'hg merge' to merge)
$ hg heads
changeset: 1:9a79c33a9db3
tag: tip
parent: -1:000000000000
user: a
date: Thu Jan 01 00:00:00 1970 +0000
summary: a
changeset: 0:01f8062b2de5
user: b
date: Thu Jan 01 00:00:00 1970 +0000
summary: b
Mads Kiilerich
tests: add missing trailing 'cd ..'...
r16913
$ cd ..