Mercurial > hg-stable
diff tests/test-convert-bzr-directories.t @ 15487:3c72117a7a0e stable
convert/bzr: fix test of divergent nested renames for bzr 1.x
54c0517c0fe8 introduced a new block in test-convert-bzr-directories.t
which produces a slightly different output with older bzr versions.
Tested with bzr 1.5 on Debian lenny.
author | Thomas Arendsen Hein <thomas@intevation.de> |
---|---|
date | Tue, 15 Nov 2011 17:16:17 +0100 |
parents | 6ba2fc0a87ab |
children | 89872688893f |
line wrap: on
line diff
--- 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