branch | stable |
changeset 15487 | 3c72117a7a0e |
parent 15461 | 6ba2fc0a87ab |
child 26066 | 89872688893f |
--- a/tests/test-convert-bzr-directories.t Thu Nov 10 17:06:12 2011 -0600 +++ b/tests/test-convert-bzr-directories.t Tue Nov 15 17:16:17 2011 +0100 @@ -165,15 +165,15 @@ a => b $ mkdir a $ bzr add a - adding a + add(ed|ing) a (re) $ bzr mv b/c a/c b/c => a/c $ bzr status added: a/ renamed: - a/ => b/ - a/c/ => a/c/ + a/? => b/? (re) + a/c/? => a/c/? (re) $ bzr commit -q -m 'Divergent renames' $ cd .. $ hg convert source source-hg