Skip to content
Snippets Groups Projects
Commit 3c72117a authored by Thomas Arendsen Hein's avatar Thomas Arendsen Hein
Browse files

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.
parent f8a0c792
No related branches found
No related tags found
No related merge requests found
......@@ -165,10 +165,10 @@
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:
......@@ -169,11 +169,11 @@
$ 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
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment