Mercurial > hg
annotate tests/test-convert-hg-sink.t @ 37238:684a6a261f30
bundle2: make source a mandatory argument for bundle2.applybundle() (API)
Currently all the callers in the core pass the source argument, making it
mandatory will help us storing right source value in bundleoperation() class.
Differential Revision: https://phab.mercurial-scm.org/D2996
author | Pulkit Goyal <7895pulkit@gmail.com> |
---|---|
date | Sat, 31 Mar 2018 14:54:12 +0530 |
parents | 40cf693fc07d |
children | 7e023ce26c7f |
rev | line source |
---|---|
5278
70e9a527cc61
convert: avoid dirstate checks; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
1 |
12525
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
2 $ cat >> $HGRCPATH <<EOF |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
3 > [extensions] |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
4 > convert= |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
5 > [convert] |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
6 > hg.saverev=False |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
7 > EOF |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
8 $ hg init orig |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
9 $ cd orig |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
10 $ echo foo > foo |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
11 $ echo bar > bar |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
12 $ hg ci -qAm 'add foo and bar' |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
13 $ hg rm foo |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
14 $ hg ci -m 'remove foo' |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
15 $ mkdir foo |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
16 $ echo file > foo/file |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
17 $ hg ci -qAm 'add foo/file' |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
18 $ hg tag some-tag |
21498
6b8daeea638a
convert: mercurial source: convert global tags only - not local tags
Mads Kiilerich <madski@unity3d.com>
parents:
20372
diff
changeset
|
19 $ hg tag -l local-tag |
12525
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
20 $ hg log |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
21 changeset: 3:593cbf6fb2b4 |
21498
6b8daeea638a
convert: mercurial source: convert global tags only - not local tags
Mads Kiilerich <madski@unity3d.com>
parents:
20372
diff
changeset
|
22 tag: local-tag |
12525
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
23 tag: tip |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
24 user: test |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
25 date: Thu Jan 01 00:00:00 1970 +0000 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
26 summary: Added tag some-tag for changeset ad681a868e44 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
27 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
28 changeset: 2:ad681a868e44 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
29 tag: some-tag |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
30 user: test |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
31 date: Thu Jan 01 00:00:00 1970 +0000 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
32 summary: add foo/file |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
33 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
34 changeset: 1:cbba8ecc03b7 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
35 user: test |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
36 date: Thu Jan 01 00:00:00 1970 +0000 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
37 summary: remove foo |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
38 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
39 changeset: 0:327daa9251fa |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
40 user: test |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
41 date: Thu Jan 01 00:00:00 1970 +0000 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
42 summary: add foo and bar |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
43 |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
44 $ hg phase --public -r tip |
12525
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
45 $ cd .. |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
46 $ hg convert orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
47 initializing destination new repository |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
48 scanning source... |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
49 sorting... |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
50 converting... |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
51 3 add foo and bar |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
52 2 remove foo |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
53 1 add foo/file |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
54 0 Added tag some-tag for changeset ad681a868e44 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
55 $ cd new |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
56 $ hg log -G --template '{rev} {node|short} ({phase}) "{desc}"\n' |
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
57 o 3 593cbf6fb2b4 (public) "Added tag some-tag for changeset ad681a868e44" |
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
58 | |
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
59 o 2 ad681a868e44 (public) "add foo/file" |
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
60 | |
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
61 o 1 cbba8ecc03b7 (public) "remove foo" |
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
62 | |
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
63 o 0 327daa9251fa (public) "add foo and bar" |
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
64 |
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
65 |
12525
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
66 $ hg out ../orig |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
67 comparing with ../orig |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
68 searching for changes |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
69 no changes found |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
70 [1] |
5278
70e9a527cc61
convert: avoid dirstate checks; add a test
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
diff
changeset
|
71 |
12525
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
72 dirstate should be empty: |
5279
2dbd750b3ddd
convert: clear the dirstate before a conversion, invalidate it afterwards
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5278
diff
changeset
|
73 |
12525
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
74 $ hg debugstate |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
75 $ hg parents -q |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
76 $ hg up -C |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
77 3 files updated, 0 files merged, 0 files removed, 0 files unresolved |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
78 $ hg copy bar baz |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
79 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
80 put something in the dirstate: |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
81 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
82 $ hg debugstate > debugstate |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
83 $ grep baz debugstate |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
84 a 0 -1 unset baz |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
85 copy: bar -> baz |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
86 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
87 add a new revision in the original repo |
5279
2dbd750b3ddd
convert: clear the dirstate before a conversion, invalidate it afterwards
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5278
diff
changeset
|
88 |
12525
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
89 $ cd ../orig |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
90 $ echo baz > baz |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
91 $ hg ci -qAm 'add baz' |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
92 $ cd .. |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
93 $ hg convert orig new 2>&1 | grep -v 'subversion python bindings could not be loaded' |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
94 scanning source... |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
95 sorting... |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
96 converting... |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
97 0 add baz |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
98 $ cd new |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
99 $ hg out ../orig |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
100 comparing with ../orig |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
101 searching for changes |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
102 no changes found |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
103 [1] |
5279
2dbd750b3ddd
convert: clear the dirstate before a conversion, invalidate it afterwards
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5278
diff
changeset
|
104 |
12525
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
105 dirstate should be the same (no output below): |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
106 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
107 $ hg debugstate > new-debugstate |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
108 $ diff debugstate new-debugstate |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
109 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
110 no copies |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
111 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
112 $ hg up -C |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
113 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
114 $ hg debugrename baz |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
115 baz not renamed |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
116 $ cd .. |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
117 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
118 test tag rewriting |
5279
2dbd750b3ddd
convert: clear the dirstate before a conversion, invalidate it afterwards
Alexis S. L. Carvalho <alexis@cecm.usp.br>
parents:
5278
diff
changeset
|
119 |
12525
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
120 $ cat > filemap <<EOF |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
121 > exclude foo |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
122 > EOF |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
123 $ hg convert --filemap filemap orig new-filemap 2>&1 | grep -v 'subversion python bindings could not be loaded' |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
124 initializing destination new-filemap repository |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
125 scanning source... |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
126 sorting... |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
127 converting... |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
128 4 add foo and bar |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
129 3 remove foo |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
130 2 add foo/file |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
131 1 Added tag some-tag for changeset ad681a868e44 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
132 0 add baz |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
133 $ cd new-filemap |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
134 $ hg tags |
20372
45562379ce4e
convert: replace old sha1s in the description
Sean Farley <sean.michael.farley@gmail.com>
parents:
19892
diff
changeset
|
135 tip 2:3c74706b1ff8 |
12525
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
136 some-tag 0:ba8636729451 |
81bf25ddd76a
tests: unify test-convert-hg-sink
Matt Mackall <mpm@selenic.com>
parents:
8693
diff
changeset
|
137 $ cd .. |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
138 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
139 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
140 Test cases for hg-hg roundtrip |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
141 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
142 Helper |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
143 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
144 $ glog() |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
145 > { |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
146 > hg log -G --template '{rev} {node|short} ({phase}) "{desc}" files: {files}\n' $* |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
147 > } |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
148 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
149 Create a tricky source repo |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
150 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
151 $ hg init source |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
152 $ cd source |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
153 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
154 $ echo 0 > 0 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
155 $ hg ci -Aqm '0: add 0' |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
156 $ echo a > a |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
157 $ mkdir dir |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
158 $ echo b > dir/b |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
159 $ hg ci -qAm '1: add a and dir/b' |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
160 $ echo c > dir/c |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
161 $ hg ci -qAm '2: add dir/c' |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
162 $ hg copy a e |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
163 $ echo b >> b |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
164 $ hg ci -qAm '3: copy a to e, change b' |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
165 $ hg up -qr -3 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
166 $ echo a >> a |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
167 $ hg ci -qAm '4: change a' |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
168 $ hg merge |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
169 merging a and e to e |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
170 2 files updated, 1 files merged, 0 files removed, 0 files unresolved |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
171 (branch merge, don't forget to commit) |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
172 $ hg copy b dir/d |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
173 $ hg ci -qAm '5: merge 2 and 3, copy b to dir/d' |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
174 $ echo a >> a |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
175 $ hg ci -qAm '6: change a' |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
176 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
177 $ hg mani |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
178 0 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
179 a |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
180 b |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
181 dir/b |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
182 dir/c |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
183 dir/d |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
184 e |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
185 $ hg phase --public -r tip |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
186 $ glog |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
187 @ 6 0613c8e59a3d (public) "6: change a" files: a |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
188 | |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
189 o 5 717e9b37cdb7 (public) "5: merge 2 and 3, copy b to dir/d" files: dir/d e |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
190 |\ |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
191 | o 4 86a55cb968d5 (public) "4: change a" files: a |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
192 | | |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
193 o | 3 0e6e235919dd (public) "3: copy a to e, change b" files: b e |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
194 | | |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
195 o | 2 0394b0d5e4f7 (public) "2: add dir/c" files: dir/c |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
196 |/ |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
197 o 1 333546584845 (public) "1: add a and dir/b" files: a dir/b |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
198 | |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
199 o 0 d1a24e2ebd23 (public) "0: add 0" files: 0 |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
200 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
201 $ cd .. |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
202 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
203 Convert excluding rev 0 and dir/ (and thus rev2): |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
204 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
205 $ cat << EOF > filemap |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
206 > exclude dir |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
207 > EOF |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
208 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
209 $ hg convert --filemap filemap source dest --config convert.hg.revs=1:: |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
210 initializing destination dest repository |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
211 scanning source... |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
212 sorting... |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
213 converting... |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
214 5 1: add a and dir/b |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
215 4 2: add dir/c |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
216 3 3: copy a to e, change b |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
217 2 4: change a |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
218 1 5: merge 2 and 3, copy b to dir/d |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
219 0 6: change a |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
220 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
221 Verify that conversion skipped rev 2: |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
222 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
223 $ glog -R dest |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
224 o 4 78814e84a217 (draft) "6: change a" files: a |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
225 | |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
226 o 3 f7cff662c5e5 (draft) "5: merge 2 and 3, copy b to dir/d" files: e |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
227 |\ |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
228 | o 2 ab40a95b0072 (draft) "4: change a" files: a |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
229 | | |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
230 o | 1 bd51f17597bf (draft) "3: copy a to e, change b" files: b e |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
231 |/ |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
232 o 0 a4a1dae0fe35 (draft) "1: add a and dir/b" files: 0 a |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
233 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
234 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
235 Verify mapping correct in both directions: |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
236 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
237 $ cat source/.hg/shamap |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
238 a4a1dae0fe3514cefd9b8541b7abbc8f44f946d5 333546584845f70c4cfecb992341aaef0e708166 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
239 bd51f17597bf32268e68a560b206898c3960cda2 0e6e235919dd8e9285ba8eb5adf703af9ad99378 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
240 ab40a95b00725307e79c2fd271000aa8af9759f4 86a55cb968d51770cba2a1630d6cc637b574580a |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
241 f7cff662c5e581e6f3f1a85ffdd2bcb35825f6ba 717e9b37cdb7eb9917ca8e30aa3f986e6d5b177d |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
242 78814e84a217894517c2de392b903ed05e6871a4 0613c8e59a3ddb9789072ef52f1ed13496489bb4 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
243 $ cat dest/.hg/shamap |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
244 333546584845f70c4cfecb992341aaef0e708166 a4a1dae0fe3514cefd9b8541b7abbc8f44f946d5 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
245 0394b0d5e4f761ced559fd0bbdc6afc16cb3f7d1 a4a1dae0fe3514cefd9b8541b7abbc8f44f946d5 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
246 0e6e235919dd8e9285ba8eb5adf703af9ad99378 bd51f17597bf32268e68a560b206898c3960cda2 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
247 86a55cb968d51770cba2a1630d6cc637b574580a ab40a95b00725307e79c2fd271000aa8af9759f4 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
248 717e9b37cdb7eb9917ca8e30aa3f986e6d5b177d f7cff662c5e581e6f3f1a85ffdd2bcb35825f6ba |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
249 0613c8e59a3ddb9789072ef52f1ed13496489bb4 78814e84a217894517c2de392b903ed05e6871a4 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
250 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
251 Verify meta data converted correctly: |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
252 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
253 $ hg -R dest log -r 1 --debug -p --git |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
254 changeset: 1:bd51f17597bf32268e68a560b206898c3960cda2 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
255 phase: draft |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
256 parent: 0:a4a1dae0fe3514cefd9b8541b7abbc8f44f946d5 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
257 parent: -1:0000000000000000000000000000000000000000 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
258 manifest: 1:040c72ed9b101773c24ac314776bfc846943781f |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
259 user: test |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
260 date: Thu Jan 01 00:00:00 1970 +0000 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
261 files+: b e |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
262 extra: branch=default |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
263 description: |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
264 3: copy a to e, change b |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
265 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
266 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
267 diff --git a/b b/b |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
268 new file mode 100644 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
269 --- /dev/null |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
270 +++ b/b |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
271 @@ -0,0 +1,1 @@ |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
272 +b |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
273 diff --git a/a b/e |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
274 copy from a |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
275 copy to e |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
276 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
277 Verify files included and excluded correctly: |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
278 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
279 $ hg -R dest manifest -r tip |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
280 0 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
281 a |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
282 b |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
283 e |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
284 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
285 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
286 Make changes in dest and convert back: |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
287 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
288 $ hg -R dest up -q |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
289 $ echo dest > dest/dest |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
290 $ hg -R dest ci -Aqm 'change in dest' |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
291 $ hg -R dest tip |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
292 changeset: 5:a2e0e3cc6d1d |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
293 tag: tip |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
294 user: test |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
295 date: Thu Jan 01 00:00:00 1970 +0000 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
296 summary: change in dest |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
297 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
298 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
299 (converting merges back after using a filemap will probably cause chaos so we |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
300 exclude merges.) |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
301 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
302 $ hg convert dest source --config convert.hg.revs='!merge()' |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
303 scanning source... |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
304 sorting... |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
305 converting... |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
306 0 change in dest |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
307 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
308 Verify the conversion back: |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
309 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
310 $ hg -R source log --debug -r tip |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
311 changeset: 7:e6d364a69ff1248b2099e603b0c145504cade6f0 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
312 tag: tip |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
313 phase: draft |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
314 parent: 6:0613c8e59a3ddb9789072ef52f1ed13496489bb4 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
315 parent: -1:0000000000000000000000000000000000000000 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
316 manifest: 7:aa3e9542f3b76d4f1f1b2e9c7ce9dbb48b6a95ec |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
317 user: test |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
318 date: Thu Jan 01 00:00:00 1970 +0000 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
319 files+: dest |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
320 extra: branch=default |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
321 description: |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
322 change in dest |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
323 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
324 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
325 Files that had been excluded are still present: |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
326 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
327 $ hg -R source manifest -r tip |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
328 0 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
329 a |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
330 b |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
331 dest |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
332 dir/b |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
333 dir/c |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
334 dir/d |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
335 e |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
336 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
337 More source changes |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
338 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
339 $ cd source |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
340 $ echo 1 >> a |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
341 $ hg ci -m '8: source first branch' |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
342 created new head |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
343 $ hg up -qr -2 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
344 $ echo 2 >> a |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
345 $ hg ci -m '9: source second branch' |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
346 $ hg merge -q --tool internal:local |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
347 $ hg ci -m '10: source merge' |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
348 $ echo >> a |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
349 $ hg ci -m '11: source change' |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
350 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
351 $ hg mani |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
352 0 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
353 a |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
354 b |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
355 dest |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
356 dir/b |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
357 dir/c |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
358 dir/d |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
359 e |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
360 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
361 $ glog -r 6: |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
362 @ 11 0c8927d1f7f4 (draft) "11: source change" files: a |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
363 | |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
364 o 10 9ccb7ee8d261 (draft) "10: source merge" files: a |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
365 |\ |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
366 | o 9 f131b1518dba (draft) "9: source second branch" files: a |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
367 | | |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
368 o | 8 669cf0e74b50 (draft) "8: source first branch" files: a |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
369 | | |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
370 | o 7 e6d364a69ff1 (draft) "change in dest" files: dest |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
371 |/ |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
372 o 6 0613c8e59a3d (public) "6: change a" files: a |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
373 | |
28627
d7af9b4ae7dd
graphmod: set default edge styles for ascii graphs (BC)
Martijn Pieters <mjpieters@fb.com>
parents:
25571
diff
changeset
|
374 ~ |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
375 $ cd .. |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
376 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
377 $ hg convert --filemap filemap source dest --config convert.hg.revs=3: |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
378 scanning source... |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
379 sorting... |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
380 converting... |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
381 3 8: source first branch |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
382 2 9: source second branch |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
383 1 10: source merge |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
384 0 11: source change |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
385 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
386 $ glog -R dest |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
387 o 9 8432d597b263 (draft) "11: source change" files: a |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
388 | |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
389 o 8 632ffacdcd6f (draft) "10: source merge" files: a |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
390 |\ |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
391 | o 7 049cfee90ee6 (draft) "9: source second branch" files: a |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
392 | | |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
393 o | 6 9b6845e036e5 (draft) "8: source first branch" files: a |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
394 | | |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
395 | @ 5 a2e0e3cc6d1d (draft) "change in dest" files: dest |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
396 |/ |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
397 o 4 78814e84a217 (draft) "6: change a" files: a |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
398 | |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
399 o 3 f7cff662c5e5 (draft) "5: merge 2 and 3, copy b to dir/d" files: e |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
400 |\ |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
401 | o 2 ab40a95b0072 (draft) "4: change a" files: a |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
402 | | |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
403 o | 1 bd51f17597bf (draft) "3: copy a to e, change b" files: b e |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
404 |/ |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
405 o 0 a4a1dae0fe35 (draft) "1: add a and dir/b" files: 0 a |
19892
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
406 |
77872b002e73
convert: update source shamap when using filemap, just as when not using filemap
Mads Kiilerich <madski@unity3d.com>
parents:
12525
diff
changeset
|
407 $ cd .. |
21633
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
408 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
409 Two way tests |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
410 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
411 $ hg init 0 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
412 $ echo f > 0/f |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
413 $ echo a > 0/a-only |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
414 $ echo b > 0/b-only |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
415 $ hg -R 0 ci -Aqm0 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
416 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
417 $ cat << EOF > filemap-a |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
418 > exclude b-only |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
419 > EOF |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
420 $ cat << EOF > filemap-b |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
421 > exclude a-only |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
422 > EOF |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
423 $ hg convert --filemap filemap-a 0 a |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
424 initializing destination a repository |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
425 scanning source... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
426 sorting... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
427 converting... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
428 0 0 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
429 $ hg -R a up -q |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
430 $ echo a > a/f |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
431 $ hg -R a ci -ma |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
432 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
433 $ hg convert --filemap filemap-b 0 b |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
434 initializing destination b repository |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
435 scanning source... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
436 sorting... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
437 converting... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
438 0 0 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
439 $ hg -R b up -q |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
440 $ echo b > b/f |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
441 $ hg -R b ci -mb |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
442 |
32066
40cf693fc07d
tests: pass only one file at a time to tail(1)
Augie Fackler <augie@google.com>
parents:
28627
diff
changeset
|
443 $ tail 0/.hg/shamap |
21633
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
444 86f3f774ffb682bffb5dc3c1d3b3da637cb9a0d6 8a028c7c77f6c7bd6d63bc3f02ca9f779eabf16a |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
445 dd9f218eb91fb857f2a62fe023e1d64a4e7812fe 8a028c7c77f6c7bd6d63bc3f02ca9f779eabf16a |
32066
40cf693fc07d
tests: pass only one file at a time to tail(1)
Augie Fackler <augie@google.com>
parents:
28627
diff
changeset
|
446 $ tail a/.hg/shamap |
21633
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
447 8a028c7c77f6c7bd6d63bc3f02ca9f779eabf16a 86f3f774ffb682bffb5dc3c1d3b3da637cb9a0d6 |
32066
40cf693fc07d
tests: pass only one file at a time to tail(1)
Augie Fackler <augie@google.com>
parents:
28627
diff
changeset
|
448 $ tail b/.hg/shamap |
21633
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
449 8a028c7c77f6c7bd6d63bc3f02ca9f779eabf16a dd9f218eb91fb857f2a62fe023e1d64a4e7812fe |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
450 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
451 $ hg convert a 0 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
452 scanning source... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
453 sorting... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
454 converting... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
455 0 a |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
456 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
457 $ hg convert b 0 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
458 scanning source... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
459 sorting... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
460 converting... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
461 0 b |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
462 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
463 $ hg -R 0 log -G |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
464 o changeset: 2:637fbbbe96b6 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
465 | tag: tip |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
466 | parent: 0:8a028c7c77f6 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
467 | user: test |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
468 | date: Thu Jan 01 00:00:00 1970 +0000 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
469 | summary: b |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
470 | |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
471 | o changeset: 1:ec7b9c96e692 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
472 |/ user: test |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
473 | date: Thu Jan 01 00:00:00 1970 +0000 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
474 | summary: a |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
475 | |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
476 @ changeset: 0:8a028c7c77f6 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
477 user: test |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
478 date: Thu Jan 01 00:00:00 1970 +0000 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
479 summary: 0 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
480 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
481 $ hg convert --filemap filemap-b 0 a --config convert.hg.revs=1:: |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
482 scanning source... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
483 sorting... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
484 converting... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
485 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
486 $ hg -R 0 up -r1 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
487 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
488 $ echo f >> 0/f |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
489 $ hg -R 0 ci -mx |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
490 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
491 $ hg convert --filemap filemap-b 0 a --config convert.hg.revs=1:: |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
492 scanning source... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
493 sorting... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
494 converting... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
495 0 x |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
496 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
497 $ hg -R a log -G -T '{rev} {desc|firstline} ({files})\n' |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
498 o 2 x (f) |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
499 | |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
500 @ 1 a (f) |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
501 | |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
502 o 0 0 (a-only f) |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
503 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
504 $ hg -R a mani -r tip |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
505 a-only |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
506 f |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
507 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
508 An additional round, demonstrating that unchanged files don't get converted |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
509 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
510 $ echo f >> 0/f |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
511 $ echo f >> 0/a-only |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
512 $ hg -R 0 ci -m "extra f+a-only change" |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
513 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
514 $ hg convert --filemap filemap-b 0 a --config convert.hg.revs=1:: |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
515 scanning source... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
516 sorting... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
517 converting... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
518 0 extra f+a-only change |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
519 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
520 $ hg -R a log -G -T '{rev} {desc|firstline} ({files})\n' |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
521 o 3 extra f+a-only change (f) |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
522 | |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
523 o 2 x (f) |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
524 | |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
525 @ 1 a (f) |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
526 | |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
527 o 0 0 (a-only f) |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
528 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
529 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
530 Conversion after rollback |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
531 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
532 $ hg -R a rollback -f |
25571
1abfe639a70c
convert: apply the appropriate phases to the destination (issue4165)
Matt Harbison <matt_harbison@yahoo.com>
parents:
22300
diff
changeset
|
533 repository tip rolled back to revision 2 (undo convert) |
21633
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
534 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
535 $ hg convert --filemap filemap-b 0 a --config convert.hg.revs=1:: |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
536 scanning source... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
537 sorting... |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
538 converting... |
21636
3de9f2c4900c
convert: only consider shamap revisions converted if they still exists
Mads Kiilerich <madski@unity3d.com>
parents:
21633
diff
changeset
|
539 0 extra f+a-only change |
21633
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
540 |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
541 $ hg -R a log -G -T '{rev} {desc|firstline} ({files})\n' |
21636
3de9f2c4900c
convert: only consider shamap revisions converted if they still exists
Mads Kiilerich <madski@unity3d.com>
parents:
21633
diff
changeset
|
542 o 3 extra f+a-only change (f) |
3de9f2c4900c
convert: only consider shamap revisions converted if they still exists
Mads Kiilerich <madski@unity3d.com>
parents:
21633
diff
changeset
|
543 | |
21633
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
544 o 2 x (f) |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
545 | |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
546 @ 1 a (f) |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
547 | |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
548 o 0 0 (a-only f) |
0ae44984b8d9
tests: better tests for two-way convert
Mads Kiilerich <madski@unity3d.com>
parents:
21498
diff
changeset
|
549 |
22300
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
21636
diff
changeset
|
550 Convert with --full adds and removes files that didn't change |
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
21636
diff
changeset
|
551 |
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
21636
diff
changeset
|
552 $ echo f >> 0/f |
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
21636
diff
changeset
|
553 $ hg -R 0 ci -m "f" |
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
21636
diff
changeset
|
554 $ hg convert --filemap filemap-b --full 0 a --config convert.hg.revs=1:: |
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
21636
diff
changeset
|
555 scanning source... |
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
21636
diff
changeset
|
556 sorting... |
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
21636
diff
changeset
|
557 converting... |
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
21636
diff
changeset
|
558 0 f |
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
21636
diff
changeset
|
559 $ hg -R a status --change tip |
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
21636
diff
changeset
|
560 M f |
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
21636
diff
changeset
|
561 A b-only |
35ab037de989
convert: introduce --full for converting all files
Mads Kiilerich <madski@unity3d.com>
parents:
21636
diff
changeset
|
562 R a-only |