equal
deleted
inserted
replaced
147 % manifest of tip |
147 % manifest of tip |
148 644 second/file |
148 644 second/file |
149 644 second/something |
149 644 second/something |
150 644 third/dummy |
150 644 third/dummy |
151 $ cd .. |
151 $ cd .. |
|
152 |
|
153 divergent nested renames (issue3089) |
|
154 |
|
155 $ mkdir test-divergent-renames |
|
156 $ cd test-divergent-renames |
|
157 $ bzr init -q source |
|
158 $ cd source |
|
159 $ mkdir -p a/c |
|
160 $ echo a > a/fa |
|
161 $ echo c > a/c/fc |
|
162 $ bzr add -q a |
|
163 $ bzr commit -q -m 'Initial layout' |
|
164 $ bzr mv a b |
|
165 a => b |
|
166 $ mkdir a |
|
167 $ bzr add a |
|
168 adding a |
|
169 $ bzr mv b/c a/c |
|
170 b/c => a/c |
|
171 $ bzr status |
|
172 added: |
|
173 a/ |
|
174 renamed: |
|
175 a/ => b/ |
|
176 a/c/ => a/c/ |
|
177 $ bzr commit -q -m 'Divergent renames' |
|
178 $ cd .. |
|
179 $ hg convert source source-hg |
|
180 initializing destination source-hg repository |
|
181 scanning source... |
|
182 sorting... |
|
183 converting... |
|
184 1 Initial layout |
|
185 0 Divergent renames |
|
186 $ hg -R source-hg st -C --change 1 |
|
187 A b/fa |
|
188 a/fa |
|
189 R a/fa |
|
190 $ hg -R source-hg manifest -r 1 |
|
191 a/c/fc |
|
192 b/fa |
|
193 $ cd .. |