1 Issue586: removing remote files after merge appears to corrupt the |
|
2 dirstate |
|
3 |
|
4 $ hg init a |
|
5 $ cd a |
|
6 $ echo a > a |
|
7 $ hg ci -Ama |
|
8 adding a |
|
9 |
|
10 $ hg init ../b |
|
11 $ cd ../b |
|
12 $ echo b > b |
|
13 $ hg ci -Amb |
|
14 adding b |
|
15 |
|
16 $ hg pull -f ../a |
|
17 pulling from ../a |
|
18 searching for changes |
|
19 warning: repository is unrelated |
|
20 requesting all changes |
|
21 adding changesets |
|
22 adding manifests |
|
23 adding file changes |
|
24 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
25 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
26 $ hg merge |
|
27 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
28 (branch merge, don't forget to commit) |
|
29 $ hg rm -f a |
|
30 $ hg ci -Amc |
|
31 |
|
32 $ hg st -A |
|
33 C b |
|
34 $ cd .. |
|
35 |
|
36 Issue1433: Traceback after two unrelated pull, two move, a merge and |
|
37 a commit (related to issue586) |
|
38 |
|
39 create test repos |
|
40 |
|
41 $ hg init repoa |
|
42 $ touch repoa/a |
|
43 $ hg -R repoa ci -Am adda |
|
44 adding a |
|
45 |
|
46 $ hg init repob |
|
47 $ touch repob/b |
|
48 $ hg -R repob ci -Am addb |
|
49 adding b |
|
50 |
|
51 $ hg init repoc |
|
52 $ cd repoc |
|
53 $ hg pull ../repoa |
|
54 pulling from ../repoa |
|
55 requesting all changes |
|
56 adding changesets |
|
57 adding manifests |
|
58 adding file changes |
|
59 added 1 changesets with 1 changes to 1 files |
|
60 (run 'hg update' to get a working copy) |
|
61 $ hg update |
|
62 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
63 $ mkdir tst |
|
64 $ hg mv * tst |
|
65 $ hg ci -m "import a in tst" |
|
66 $ hg pull -f ../repob |
|
67 pulling from ../repob |
|
68 searching for changes |
|
69 warning: repository is unrelated |
|
70 requesting all changes |
|
71 adding changesets |
|
72 adding manifests |
|
73 adding file changes |
|
74 added 1 changesets with 1 changes to 1 files (+1 heads) |
|
75 (run 'hg heads' to see heads, 'hg merge' to merge) |
|
76 |
|
77 merge both repos |
|
78 |
|
79 $ hg merge |
|
80 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
81 (branch merge, don't forget to commit) |
|
82 $ mkdir src |
|
83 |
|
84 move b content |
|
85 |
|
86 $ hg mv b src |
|
87 $ hg ci -m "import b in src" |
|
88 $ hg manifest |
|
89 src/b |
|
90 tst/a |
|
91 |
|
92 $ cd .. |
|