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 (from parent 1:
ff3184c
)
Got rid of indeterminacy in the overlapping-files.
author
Wayne Davison
<wayned@samba.org>
Wed, 28 Jan 2004 00:37:55 +0000
(
00:37
+0000)
committer
Wayne Davison
<wayned@samba.org>
Wed, 28 Jan 2004 00:37:55 +0000
(
00:37
+0000)
testsuite/merge.test
patch
|
blob
|
blame
|
history
diff --git
a/testsuite/merge.test
b/testsuite/merge.test
index
fcdc815
..
3a195c4
100644
(file)
--- a/
testsuite/merge.test
+++ b/
testsuite/merge.test
@@
-25,15
+25,15
@@
mkdir "$from2dir"/sub1 "$from3dir"/sub1
mkdir "$from3dir"/sub2
mkdir "$chkdir" "$chkdir"/sub1 "$chkdir"/sub2
echo "one" >"$from1dir"/one
mkdir "$from3dir"/sub2
mkdir "$chkdir" "$chkdir"/sub1 "$chkdir"/sub2
echo "one" >"$from1dir"/one
-
echo "uno" >
"$from2dir"/one
-
echo "1" >
"$from3dir"/one
+
cp -p "$from1dir"/one
"$from2dir"/one
+
cp -p "$from1dir"/one
"$from3dir"/one
echo "two" >"$from1dir"/two
echo "three" >"$from2dir"/three
echo "four" >"$from3dir"/four
echo "five" >"$from1dir"/five
echo "six" >"$from3dir"/six
echo "sub1" >"$from2dir"/sub1/uno
echo "two" >"$from1dir"/two
echo "three" >"$from2dir"/three
echo "four" >"$from3dir"/four
echo "five" >"$from1dir"/five
echo "six" >"$from3dir"/six
echo "sub1" >"$from2dir"/sub1/uno
-
echo "hmm1" >
"$from3dir"/sub1/uno
+
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
@@
-42,10
+42,8
@@
cp -p "$from1dir"/one "$from1dir"/two "$from2dir"/three "$from3dir"/four "$from1
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
-# Fix the directory times
-$RSYNC -av --include='*/' --exclude='*' "$from3dir/" "$chkdir/"
-$RSYNC -av --include='*/' --exclude='*' "$from2dir/" "$chkdir/"
-$RSYNC -av --include='*/' --exclude='*' "$from1dir/" "$chkdir/"
+# Get rid of any directory-time differences
+find "$from1dir" "$from2dir" "$from3dir" "$chkdir" -type d -print0 | xargs -0 touch
checkit "$RSYNC -aHvv \"$fromdir\"?/ \"$todir/\"" "$chkdir" "$todir"
checkit "$RSYNC -aHvv \"$fromdir\"?/ \"$todir/\"" "$chkdir" "$todir"