# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 2011-11-15 16:16:17
# Node ID 3c72117a7a0e3f830cd9a433aeca8dab4e7dc02f
# Parent  f8a0c79254965fd34eb9cbe82387115c5d7d7a59

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.

diff --git a/tests/test-convert-bzr-directories.t b/tests/test-convert-bzr-directories.t
--- a/tests/test-convert-bzr-directories.t
+++ b/tests/test-convert-bzr-directories.t
@@ -165,15 +165,15 @@ divergent nested renames (issue3089)
   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