comparison tests/test-unrelated-pull.t @ 12279:28e2e3804f2e

combine tests
author Adrian Buehlmann <adrian@cadifra.com>
date Tue, 14 Sep 2010 12:20:51 +0200
parents tests/test-unrelated-pull@4c94b6d0fb1c
children 4134686b83e1
comparison
equal deleted inserted replaced
12278:c4c2ba553401 12279:28e2e3804f2e
1 $ mkdir a
2 $ cd a
3 $ hg init
4 $ echo 123 > a
5 $ hg add a
6 $ hg commit -m "a" -u a
7
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
20
21 $ hg pull -f ../a
22 pulling from ../a
23 searching for changes
24 warning: repository is unrelated
25 adding changesets
26 adding manifests
27 adding file changes
28 added 1 changesets with 1 changes to 1 files (+1 heads)
29 (run 'hg heads' to see heads, 'hg merge' to merge)
30
31 $ hg heads
32 changeset: 1:9a79c33a9db3
33 tag: tip
34 parent: -1:000000000000
35 user: a
36 date: Thu Jan 01 00:00:00 1970 +0000
37 summary: a
38
39 changeset: 0:01f8062b2de5
40 user: b
41 date: Thu Jan 01 00:00:00 1970 +0000
42 summary: b
43