Mercurial > hg-stable
annotate tests/test-unrelated-pull.t @ 39064:8919cc4f63b4
patchbomb: python 3 really wants those email addresses in unicode
At this point, test-patchbomb-tls.t almost passes on Python 3, but I'm
not really sure what the issue is: we just get a `abort: Connection
unexpectedly closed` that doesn't make sense to me.
Differential Revision: https://phab.mercurial-scm.org/D3957
author | Augie Fackler <augie@google.com> |
---|---|
date | Mon, 16 Jul 2018 18:17:44 -0400 |
parents | eb586ed5d8ce |
children |
rev | line source |
---|---|
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
13742
diff
changeset
|
1 $ hg init a |
12279 | 2 $ cd a |
3 $ echo 123 > a | |
4 $ hg add a | |
5 $ hg commit -m "a" -u a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
579
diff
changeset
|
6 |
12279 | 7 $ cd .. |
13956
ffb5c09ba822
tests: remove redundant mkdir
Martin Geisler <mg@lazybytes.net>
parents:
13742
diff
changeset
|
8 $ hg init b |
12279 | 9 $ cd b |
10 $ echo 321 > b | |
11 $ hg add b | |
12 $ hg commit -m "b" -u b | |
13 | |
14 $ hg pull ../a | |
15 pulling from ../a | |
16 searching for changes | |
17 abort: repository is unrelated | |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
18 [255] |
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
19 |
12279 | 20 $ hg pull -f ../a |
21 pulling from ../a | |
22 searching for changes | |
23 warning: repository is unrelated | |
13742
7abab875e647
discovery: avoid discovery when local graph is a subset of remote
Peter Arrenbrecht <peter.arrenbrecht@gmail.com>
parents:
12316
diff
changeset
|
24 requesting all changes |
12279 | 25 adding changesets |
26 adding manifests | |
27 adding file changes | |
28 added 1 changesets with 1 changes to 1 files (+1 heads) | |
34661
eb586ed5d8ce
transaction-summary: show the range of new revisions upon pull/unbundle (BC)
Denis Laxalde <denis.laxalde@logilab.fr>
parents:
16913
diff
changeset
|
29 new changesets 9a79c33a9db3 |
12279 | 30 (run 'hg heads' to see heads, 'hg merge' to merge) |
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
31 |
12279 | 32 $ hg heads |
33 changeset: 1:9a79c33a9db3 | |
34 tag: tip | |
35 parent: -1:000000000000 | |
36 user: a | |
37 date: Thu Jan 01 00:00:00 1970 +0000 | |
38 summary: a | |
39 | |
40 changeset: 0:01f8062b2de5 | |
41 user: b | |
42 date: Thu Jan 01 00:00:00 1970 +0000 | |
43 summary: b | |
44 | |
16913
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
13956
diff
changeset
|
45 |
f2719b387380
tests: add missing trailing 'cd ..'
Mads Kiilerich <mads@kiilerich.com>
parents:
13956
diff
changeset
|
46 $ cd .. |