summaryrefslogtreecommitdiff
path: root/tests/test-convert-bzr-directories.t
diff options
context:
space:
mode:
authorLorry Tar Creator <lorry-tar-importer@baserock.org>2011-10-01 20:49:36 +0000
committerLorry <lorry@roadtrain.codethink.co.uk>2012-09-27 13:27:51 +0000
commit921ced43c48c1d170452a7b251b94cc96ec8dd44 (patch)
tree3c4a89176ea67fe4c7bf7b375488361a823c95fa /tests/test-convert-bzr-directories.t
parent9039c805b0a7e36220101323f82735f08a104b37 (diff)
downloadmercurial-tarball-921ced43c48c1d170452a7b251b94cc96ec8dd44.tar.gz
Imported from /srv/lorry/lorry-area/mercurial-tarball/mercurial-1.9.3.tar.gz.HEADmercurial-1.9.3master
Diffstat (limited to 'tests/test-convert-bzr-directories.t')
-rw-r--r--tests/test-convert-bzr-directories.t42
1 files changed, 0 insertions, 42 deletions
diff --git a/tests/test-convert-bzr-directories.t b/tests/test-convert-bzr-directories.t
index 653d7b1..613fd6a 100644
--- a/tests/test-convert-bzr-directories.t
+++ b/tests/test-convert-bzr-directories.t
@@ -149,45 +149,3 @@ directory replace
644 second/something
644 third/dummy
$ cd ..
-
-divergent nested renames (issue3089)
-
- $ mkdir test-divergent-renames
- $ cd test-divergent-renames
- $ bzr init -q source
- $ cd source
- $ mkdir -p a/c
- $ echo a > a/fa
- $ echo c > a/c/fc
- $ bzr add -q a
- $ bzr commit -q -m 'Initial layout'
- $ bzr mv a b
- a => b
- $ mkdir a
- $ bzr add a
- add(ed|ing) a (re)
- $ bzr mv b/c a/c
- b/c => a/c
- $ bzr status
- added:
- a/
- renamed:
- a/? => b/? (re)
- a/c/? => a/c/? (re)
- $ bzr commit -q -m 'Divergent renames'
- $ cd ..
- $ hg convert source source-hg
- initializing destination source-hg repository
- scanning source...
- sorting...
- converting...
- 1 Initial layout
- 0 Divergent renames
- $ hg -R source-hg st -C --change 1
- A b/fa
- a/fa
- R a/fa
- $ hg -R source-hg manifest -r 1
- a/c/fc
- b/fa
- $ cd ..