Mercurial > hg
annotate tests/test-586.t @ 11904:122e3e0ba3e4
tests: unify test-keyword
author | Christian Ebert <blacktrash@gmx.net> |
---|---|
date | Fri, 13 Aug 2010 13:54:33 +0100 |
parents | 650402ea4a4f |
children | 4fee1fd3de9a |
rev | line source |
---|---|
11846 | 1 a test for issue586 |
4535
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
2 |
11846 | 3 $ hg init a |
4 $ cd a | |
5 $ echo a > a | |
6 $ hg ci -Ama | |
7 adding a | |
8 | |
9 $ hg init ../b | |
10 $ cd ../b | |
11 $ echo b > b | |
12 $ hg ci -Amb | |
13 adding b | |
4535
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
14 |
11846 | 15 $ hg pull -f ../a |
16 pulling from ../a | |
17 searching for changes | |
18 warning: repository is unrelated | |
19 adding changesets | |
20 adding manifests | |
21 adding file changes | |
22 added 1 changesets with 1 changes to 1 files (+1 heads) | |
23 (run 'hg heads' to see heads, 'hg merge' to merge) | |
24 $ hg merge | |
25 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
26 (branch merge, don't forget to commit) | |
27 $ hg rm -f a | |
28 $ hg ci -Amc | |
4535
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
29 |
11846 | 30 $ hg st -A |
31 C b | |
32 $ cd .. | |
33 | |
34 a test for issue 1433, related to issue586 | |
4535
720ae5085ee3
commit: fix bug where dirstate for removed file is confused
Matt Mackall <mpm@selenic.com>
parents:
diff
changeset
|
35 |
11846 | 36 create test repos |
37 | |
38 $ hg init repoa | |
39 $ touch repoa/a | |
40 $ hg -R repoa ci -Am adda | |
41 adding a | |
7564
f1af59451c0c
localrepo: fix bad manifest delta generation (issue1433)
Patrick Mezard <pmezard@gmail.com>
parents:
4535
diff
changeset
|
42 |
11846 | 43 $ hg init repob |
44 $ touch repob/b | |
45 $ hg -R repob ci -Am addb | |
46 adding b | |
7564
f1af59451c0c
localrepo: fix bad manifest delta generation (issue1433)
Patrick Mezard <pmezard@gmail.com>
parents:
4535
diff
changeset
|
47 |
11846 | 48 $ hg init repoc |
49 $ cd repoc | |
50 $ hg pull ../repoa | |
51 pulling from ../repoa | |
52 requesting all changes | |
53 adding changesets | |
54 adding manifests | |
55 adding file changes | |
56 added 1 changesets with 1 changes to 1 files | |
57 (run 'hg update' to get a working copy) | |
58 $ hg update | |
59 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
60 $ mkdir tst | |
61 $ hg mv * tst | |
62 $ hg ci -m "import a in tst" | |
63 $ hg pull -f ../repob | |
64 pulling from ../repob | |
65 searching for changes | |
66 warning: repository is unrelated | |
67 adding changesets | |
68 adding manifests | |
69 adding file changes | |
70 added 1 changesets with 1 changes to 1 files (+1 heads) | |
71 (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
|
72 |
11846 | 73 merge both repos |
7564
f1af59451c0c
localrepo: fix bad manifest delta generation (issue1433)
Patrick Mezard <pmezard@gmail.com>
parents:
4535
diff
changeset
|
74 |
11846 | 75 $ hg merge |
76 1 files updated, 0 files merged, 0 files removed, 0 files unresolved | |
77 (branch merge, don't forget to commit) | |
78 $ mkdir src | |
7564
f1af59451c0c
localrepo: fix bad manifest delta generation (issue1433)
Patrick Mezard <pmezard@gmail.com>
parents:
4535
diff
changeset
|
79 |
11846 | 80 move b content |
81 | |
82 $ hg mv b src | |
83 $ hg ci -m "import b in src" | |
84 $ hg manifest | |
85 src/b | |
86 tst/a | |
87 |