Mercurial > hg
annotate tests/test-586.t @ 12515:b6a784e39ad4
tests: unify test-convert-bzr-ghosts
author | Matt Mackall <mpm@selenic.com> |
---|---|
date | Sun, 26 Sep 2010 14:36:49 -0500 |
parents | 4fee1fd3de9a |
children | 7abab875e647 |
rev | line source |
---|---|
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
11846
diff
changeset
|
1 Issue586: removing remote files after merge appears to corrupt the |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
11846
diff
changeset
|
2 dirstate |
4535
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
3 |
11846 | 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 | |
4535
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
15 |
11846 | 16 $ hg pull -f ../a |
17 pulling from ../a | |
18 searching for changes | |
19 warning: repository is unrelated | |
20 adding changesets | |
21 adding manifests | |
22 adding file changes | |
23 added 1 changesets with 1 changes to 1 files (+1 heads) | |
24 (run 'hg heads' to see heads, 'hg merge' to merge) | |
25 $ hg merge | |
26 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
27 (branch merge, don't forget to commit) | |
28 $ hg rm -f a | |
29 $ hg ci -Amc | |
4535
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
30 |
11846 | 31 $ hg st -A |
32 C b | |
33 $ cd .. | |
34 | |
12399
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
11846
diff
changeset
|
35 Issue1433: Traceback after two unrelated pull, two move, a merge and |
4fee1fd3de9a
tests: added a short description to issue numbers
Martin Geisler <mg@aragost.com>
parents:
11846
diff
changeset
|
36 a commit (related to issue586) |
4535
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
37 |
11846 | 38 create test repos |
39 | |
40 $ hg init repoa | |
41 $ touch repoa/a | |
42 $ hg -R repoa ci -Am adda | |
43 adding a | |
7564
f1af59451c0c
localrepo: fix bad manifest delta generation (issue1433)
Patrick Mezard <pmezard@gmail.com>
parents:
4535
diff
changeset
|
44 |
11846 | 45 $ hg init repob |
46 $ touch repob/b | |
47 $ hg -R repob ci -Am addb | |
48 adding b | |
7564
f1af59451c0c
localrepo: fix bad manifest delta generation (issue1433)
Patrick Mezard <pmezard@gmail.com>
parents:
4535
diff
changeset
|
49 |
11846 | 50 $ hg init repoc |
51 $ cd repoc | |
52 $ hg pull ../repoa | |
53 pulling from ../repoa | |
54 requesting all changes | |
55 adding changesets | |
56 adding manifests | |
57 adding file changes | |
58 added 1 changesets with 1 changes to 1 files | |
59 (run 'hg update' to get a working copy) | |
60 $ hg update | |
61 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
62 $ mkdir tst | |
63 $ hg mv * tst | |
64 $ hg ci -m "import a in tst" | |
65 $ hg pull -f ../repob | |
66 pulling from ../repob | |
67 searching for changes | |
68 warning: repository is unrelated | |
69 adding changesets | |
70 adding manifests | |
71 adding file changes | |
72 added 1 changesets with 1 changes to 1 files (+1 heads) | |
73 (run 'hg heads' to see heads, 'hg merge' to merge) | |
7564
f1af59451c0c
localrepo: fix bad manifest delta generation (issue1433)
Patrick Mezard <pmezard@gmail.com>
parents:
4535
diff
changeset
|
74 |
11846 | 75 merge both repos |
7564
f1af59451c0c
localrepo: fix bad manifest delta generation (issue1433)
Patrick Mezard <pmezard@gmail.com>
parents:
4535
diff
changeset
|
76 |
11846 | 77 $ hg merge |
78 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
79 (branch merge, don't forget to commit) | |
80 $ mkdir src | |
7564
f1af59451c0c
localrepo: fix bad manifest delta generation (issue1433)
Patrick Mezard <pmezard@gmail.com>
parents:
4535
diff
changeset
|
81 |
11846 | 82 move b content |
83 | |
84 $ hg mv b src | |
85 $ hg ci -m "import b in src" | |
86 $ hg manifest | |
87 src/b | |
88 tst/a | |
89 |