7 |
7 |
8 empty directory |
8 empty directory |
9 |
9 |
10 $ mkdir test-empty |
10 $ mkdir test-empty |
11 $ cd test-empty |
11 $ cd test-empty |
12 $ bzr init -q source |
12 $ brz init -q source |
13 $ cd source |
13 $ cd source |
14 $ echo content > a |
14 $ echo content > a |
15 $ bzr add -q a |
15 $ brz add -q a |
16 $ bzr commit -q -m 'Initial add' |
16 $ brz commit -q -m 'Initial add' |
17 $ mkdir empty |
17 $ mkdir empty |
18 $ bzr add -q empty |
18 $ brz add -q empty |
19 $ bzr commit -q -m 'Empty directory added' |
19 $ brz commit -q -m 'Empty directory added' |
20 $ echo content > empty/something |
20 $ echo content > empty/something |
21 $ bzr add -q empty/something |
21 $ brz add -q empty/something |
22 $ bzr commit -q -m 'Added file into directory' |
22 $ brz commit -q -m 'Added file into directory' |
23 $ cd .. |
23 $ cd .. |
24 $ hg convert source source-hg |
24 $ hg convert source source-hg |
25 initializing destination source-hg repository |
25 initializing destination source-hg repository |
26 scanning source... |
26 scanning source... |
27 sorting... |
27 sorting... |
40 |
40 |
41 directory renames |
41 directory renames |
42 |
42 |
43 $ mkdir test-dir-rename |
43 $ mkdir test-dir-rename |
44 $ cd test-dir-rename |
44 $ cd test-dir-rename |
45 $ bzr init -q source |
45 $ brz init -q source |
46 $ cd source |
46 $ cd source |
47 $ mkdir tpyo |
47 $ mkdir tpyo |
48 $ echo content > tpyo/something |
48 $ echo content > tpyo/something |
49 $ bzr add -q tpyo |
49 $ brz add -q tpyo |
50 $ bzr commit -q -m 'Added directory' |
50 $ brz commit -q -m 'Added directory' |
51 $ bzr mv tpyo typo |
51 $ brz mv tpyo typo |
52 tpyo => typo |
52 tpyo => typo |
53 $ bzr commit -q -m 'Oops, typo' |
53 $ brz commit -q -m 'Oops, typo' |
54 $ cd .. |
54 $ cd .. |
55 $ hg convert source source-hg |
55 $ hg convert source source-hg |
56 initializing destination source-hg repository |
56 initializing destination source-hg repository |
57 scanning source... |
57 scanning source... |
58 sorting... |
58 sorting... |
69 |
69 |
70 nested directory renames |
70 nested directory renames |
71 |
71 |
72 $ mkdir test-nested-dir-rename |
72 $ mkdir test-nested-dir-rename |
73 $ cd test-nested-dir-rename |
73 $ cd test-nested-dir-rename |
74 $ bzr init -q source |
74 $ brz init -q source |
75 $ cd source |
75 $ cd source |
76 $ mkdir -p firstlevel/secondlevel/thirdlevel |
76 $ mkdir -p firstlevel/secondlevel/thirdlevel |
77 $ echo content > firstlevel/secondlevel/file |
77 $ echo content > firstlevel/secondlevel/file |
78 $ echo this_needs_to_be_there_too > firstlevel/secondlevel/thirdlevel/stuff |
78 $ echo this_needs_to_be_there_too > firstlevel/secondlevel/thirdlevel/stuff |
79 $ bzr add -q firstlevel |
79 $ brz add -q firstlevel |
80 $ bzr commit -q -m 'Added nested directories' |
80 $ brz commit -q -m 'Added nested directories' |
81 $ bzr mv firstlevel/secondlevel secondlevel |
81 $ brz mv firstlevel/secondlevel secondlevel |
82 firstlevel/secondlevel => secondlevel |
82 firstlevel/secondlevel => secondlevel |
83 $ bzr commit -q -m 'Moved secondlevel one level up' |
83 $ brz commit -q -m 'Moved secondlevel one level up' |
84 $ cd .. |
84 $ cd .. |
85 $ hg convert source source-hg |
85 $ hg convert source source-hg |
86 initializing destination source-hg repository |
86 initializing destination source-hg repository |
87 scanning source... |
87 scanning source... |
88 sorting... |
88 sorting... |
97 |
97 |
98 directory remove |
98 directory remove |
99 |
99 |
100 $ mkdir test-dir-remove |
100 $ mkdir test-dir-remove |
101 $ cd test-dir-remove |
101 $ cd test-dir-remove |
102 $ bzr init -q source |
102 $ brz init -q source |
103 $ cd source |
103 $ cd source |
104 $ mkdir src |
104 $ mkdir src |
105 $ echo content > src/sourcecode |
105 $ echo content > src/sourcecode |
106 $ bzr add -q src |
106 $ brz add -q src |
107 $ bzr commit -q -m 'Added directory' |
107 $ brz commit -q -m 'Added directory' |
108 $ bzr rm -q src |
108 $ brz rm -q src |
109 $ bzr commit -q -m 'Removed directory' |
109 $ brz commit -q -m 'Removed directory' |
110 $ cd .. |
110 $ cd .. |
111 $ hg convert source source-hg |
111 $ hg convert source source-hg |
112 initializing destination source-hg repository |
112 initializing destination source-hg repository |
113 scanning source... |
113 scanning source... |
114 sorting... |
114 sorting... |
124 |
124 |
125 directory replace |
125 directory replace |
126 |
126 |
127 $ mkdir test-dir-replace |
127 $ mkdir test-dir-replace |
128 $ cd test-dir-replace |
128 $ cd test-dir-replace |
129 $ bzr init -q source |
129 $ brz init -q source |
130 $ cd source |
130 $ cd source |
131 $ mkdir first second |
131 $ mkdir first second |
132 $ echo content > first/file |
132 $ echo content > first/file |
133 $ echo morecontent > first/dummy |
133 $ echo morecontent > first/dummy |
134 $ echo othercontent > second/something |
134 $ echo othercontent > second/something |
135 $ bzr add -q first second |
135 $ brz add -q first second |
136 $ bzr commit -q -m 'Initial layout' |
136 $ brz commit -q -m 'Initial layout' |
137 $ bzr mv first/file second/file |
137 $ brz mv first/file second/file |
138 first/file => second/file |
138 first/file => second/file |
139 $ bzr mv first third |
139 $ brz mv first third |
140 first => third |
140 first => third |
141 $ bzr commit -q -m 'Some conflicting moves' |
141 $ brz commit -q -m 'Some conflicting moves' |
142 $ cd .. |
142 $ cd .. |
143 $ hg convert source source-hg |
143 $ hg convert source source-hg |
144 initializing destination source-hg repository |
144 initializing destination source-hg repository |
145 scanning source... |
145 scanning source... |
146 sorting... |
146 sorting... |
156 |
156 |
157 divergent nested renames (issue3089) |
157 divergent nested renames (issue3089) |
158 |
158 |
159 $ mkdir test-divergent-renames |
159 $ mkdir test-divergent-renames |
160 $ cd test-divergent-renames |
160 $ cd test-divergent-renames |
161 $ bzr init -q source |
161 $ brz init -q source |
162 $ cd source |
162 $ cd source |
163 $ mkdir -p a/c |
163 $ mkdir -p a/c |
164 $ echo a > a/fa |
164 $ echo a > a/fa |
165 $ echo c > a/c/fc |
165 $ echo c > a/c/fc |
166 $ bzr add -q a |
166 $ brz add -q a |
167 $ bzr commit -q -m 'Initial layout' |
167 $ brz commit -q -m 'Initial layout' |
168 $ bzr mv a b |
168 $ brz mv a b |
169 a => b |
169 a => b |
170 $ mkdir a |
170 $ mkdir a |
171 $ bzr add a |
171 $ brz add a |
172 add(ed|ing) a (re) |
172 add(ed|ing) a (re) |
173 $ bzr mv b/c a/c |
173 $ brz mv b/c a/c |
174 b/c => a/c |
174 b/c => a/c |
175 $ bzr status |
175 $ brz status |
176 added: |
176 added: |
177 a/ |
177 a/ |
178 renamed: |
178 renamed: |
179 a/? => b/? (re) |
179 a/? => b/? (re) |
180 a/c/? => a/c/? (re) |
180 a/c/? => a/c/? (re) |
181 $ bzr commit -q -m 'Divergent renames' |
181 $ brz commit -q -m 'Divergent renames' |
182 $ cd .. |
182 $ cd .. |
183 $ hg convert source source-hg |
183 $ hg convert source source-hg |
184 initializing destination source-hg repository |
184 initializing destination source-hg repository |
185 scanning source... |
185 scanning source... |
186 sorting... |
186 sorting... |