Mercurial > hg
annotate tests/test-unrelated-pull.t @ 13290:82133e91ce7d
record: turn consumefile() into a pure function
author | Patrick Mezard <pmezard@gmail.com> |
---|---|
date | Sun, 23 Jan 2011 12:44:05 +0100 |
parents | 4134686b83e1 |
children | 7abab875e647 |
rev | line source |
---|---|
12279 | 1 $ mkdir a |
2 $ cd a | |
3 $ hg init | |
4 $ echo 123 > a | |
5 $ hg add a | |
6 $ hg commit -m "a" -u a | |
749
7e4843b7efd2
Update tests to use commit -m and default -u
mpm@selenic.com
parents:
579
diff
changeset
|
7 |
12279 | 8 $ cd .. |
9 $ mkdir b | |
10 $ cd b | |
11 $ hg init | |
12 $ echo 321 > b | |
13 $ hg add b | |
14 $ hg commit -m "b" -u b | |
15 | |
16 $ hg pull ../a | |
17 pulling from ../a | |
18 searching for changes | |
19 abort: repository is unrelated | |
12316
4134686b83e1
tests: add exit codes to unified tests
Matt Mackall <mpm@selenic.com>
parents:
12279
diff
changeset
|
20 [255] |
579
ffeb2c3a1966
Actually warn on pulling from an unrelated repository
mpm@selenic.com
parents:
diff
changeset
|
21 |
12279 | 22 $ hg pull -f ../a |
23 pulling from ../a | |
24 searching for changes | |
25 warning: repository is unrelated | |
26 adding changesets | |
27 adding manifests | |
28 adding file changes | |
29 added 1 changesets with 1 changes to 1 files (+1 heads) | |
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 |