equal
deleted
inserted
replaced
1 #!/bin/sh |
|
2 # a test for issue586 |
|
3 |
|
4 hg init a |
|
5 cd a |
|
6 echo a > a |
|
7 hg ci -Ama |
|
8 |
|
9 hg init ../b |
|
10 cd ../b |
|
11 echo b > b |
|
12 hg ci -Amb |
|
13 |
|
14 hg pull -f ../a |
|
15 hg merge |
|
16 hg rm -f a |
|
17 hg ci -Amc |
|
18 |
|
19 hg st -A |
|
20 cd .. |
|
21 |
|
22 # a test for issue 1433, related to issue586 |
|
23 echo % create test repos |
|
24 hg init repoa |
|
25 touch repoa/a |
|
26 hg -R repoa ci -Am adda |
|
27 |
|
28 hg init repob |
|
29 touch repob/b |
|
30 hg -R repob ci -Am addb |
|
31 |
|
32 hg init repoc |
|
33 cd repoc |
|
34 hg pull ../repoa |
|
35 hg update |
|
36 mkdir tst |
|
37 hg mv * tst |
|
38 hg ci -m "import a in tst" |
|
39 hg pull -f ../repob |
|
40 echo % merge both repos |
|
41 hg merge |
|
42 mkdir src |
|
43 echo % move b content |
|
44 hg mv b src |
|
45 hg ci -m "import b in src" |
|
46 hg manifest |
|
47 |
|
48 |
|
49 |
|