Mercurial > hg-stable

diff tests/test-convert-filemap.t @ 17797:e4da793998bf

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
convert: normalize paths in filemaps (issue3612) convert doesn't normalise double slashes in paths. Path normalization is applied when a path is loaded into filemap and when a file lookup request is issued to filemap.
author Huayang <huayang@fb.com>
date Fri, 05 Oct 2012 16:27:34 -0700
parents f76e2196ee70
children 1f34b57ca319
line wrap: on
line diff
--- a/tests/test-convert-filemap.t	Wed Oct 17 15:37:25 2012 -0500
+++ b/tests/test-convert-filemap.t	Fri Oct 05 16:27:34 2012 -0700
@@ -229,11 +229,11 @@
   $ cat > renames.fmap <<EOF
   > include dir
   > exclude dir/file2
-  > rename dir dir2
+  > rename dir dir2//../dir2/
   > include foo
   > include copied
-  > rename foo foo2
-  > rename copied copied2
+  > rename foo foo2/
+  > rename copied ./copied2
   > exclude dir/subdir
   > include dir/subdir/file3
   > EOF
@@ -284,10 +284,8 @@
   > include
   > EOF
   $ hg -q convert --filemap errors.fmap source errors.repo
-  errors.fmap:1: superfluous / in exclude 'dir/'
   errors.fmap:3: superfluous / in include '/dir'
   errors.fmap:3: superfluous / in rename '/dir'
-  errors.fmap:3: superfluous / in exclude 'dir//dir'
   errors.fmap:4: unknown directive 'out of sync'
   errors.fmap:5: path to exclude is missing
   abort: errors in filemap