Matt McCutchen's Web Site
/
rsync
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
abce74b
)
Added a test for the merging of a dir and a non-dir with the same name.
author
Wayne Davison
<wayned@samba.org>
Sun, 13 Feb 2005 22:01:15 +0000
(22:01 +0000)
committer
Wayne Davison
<wayned@samba.org>
Sun, 13 Feb 2005 22:01:15 +0000
(22:01 +0000)
testsuite/merge.test
patch
|
blob
|
blame
|
history
diff --git
a/testsuite/merge.test
b/testsuite/merge.test
index
1dddf63
..
1c1586f
100644
(file)
--- a/
testsuite/merge.test
+++ b/
testsuite/merge.test
@@
-19,7
+19,7
@@
from3dir="${fromdir}3"
mkdir "$from1dir" "$from2dir" "$from3dir"
mkdir "$from2dir"/sub1 "$from3dir"/sub1
mkdir "$from1dir" "$from2dir" "$from3dir"
mkdir "$from2dir"/sub1 "$from3dir"/sub1
-mkdir "$from3dir"/sub2
+mkdir "$from3dir"/sub2
"$from1dir"/dir-and-not-dir
mkdir "$chkdir" "$chkdir"/sub1 "$chkdir"/sub2
echo "one" >"$from1dir"/one
cp -p "$from1dir"/one "$from2dir"/one
mkdir "$chkdir" "$chkdir"/sub1 "$chkdir"/sub2
echo "one" >"$from1dir"/one
cp -p "$from1dir"/one "$from2dir"/one
@@
-34,8
+34,10
@@
cp -p "$from2dir"/sub1/uno "$from3dir"/sub1/uno
echo "sub2" >"$from3dir"/sub1/dos
echo "sub3" >"$from2dir"/sub1/tres
echo "subby" >"$from3dir"/sub2/subby
echo "sub2" >"$from3dir"/sub1/dos
echo "sub3" >"$from2dir"/sub1/tres
echo "subby" >"$from3dir"/sub2/subby
+echo "not-dir" >"$from3dir"/dir-and-not-dir
cp -p "$from1dir"/one "$from1dir"/two "$from2dir"/three "$from3dir"/four "$from1dir"/five "$from3dir"/six "$chkdir"
cp -p "$from1dir"/one "$from1dir"/two "$from2dir"/three "$from3dir"/four "$from1dir"/five "$from3dir"/six "$chkdir"
+cp -p "$from3dir"/dir-and-not-dir "$chkdir"
cp -p "$from2dir"/sub1/uno "$from3dir"/sub1/dos "$from2dir"/sub1/tres "$chkdir"/sub1
cp -p "$from3dir"/sub2/subby "$chkdir"/sub2
cp -p "$from2dir"/sub1/uno "$from3dir"/sub1/dos "$from2dir"/sub1/tres "$chkdir"/sub1
cp -p "$from3dir"/sub2/subby "$chkdir"/sub2