summaryrefslogtreecommitdiff
path: root/testsuite/merge.test
AgeCommit message (Collapse)AuthorFilesLines
2008-06-17Avoid problems with timestamp rounding that cp -p and touch -r may do.Wayne Davison1-8/+8
2008-03-04- Made the itemize test check for CAN_HARDLINK_SYMLINK define insteadWayne Davison1-1/+1
of running its own test using ln. - Made the merge test call checkit with absolute paths so that some folk's cd command won't foul things up with extra output.
2007-05-25Changed verbosity back from -vvvv to -vv.Wayne Davison1-1/+1
2007-05-22Be more verbose so that we can debug what is going wrong on solaris.Wayne Davison1-1/+1
2007-04-29Added a "sleep 1" to make certain failures more reproducible.Wayne Davison1-0/+3
2007-04-26Got rid of the --no-ir kluge in this test.Wayne Davison1-2/+1
2007-04-24Specify an arg sequence that was recently failing to work.Wayne Davison1-3/+6
2007-03-18Use relative directories, and note that the merge code is onlyWayne Davison1-33/+33
working because it is not yet using --inc-recursion.
2007-03-14I managed to duplicate the hang, so hopefully it's fixed now.Wayne Davison1-4/+4
Let's restore the full test suite and find out.
2007-03-14Next step: allow protocol 30 to be used, but disallow the useWayne Davison1-4/+4
of incremental recursion. If this still avoids the hanging, I will need to try to track down how inc_recurse can deadlock.
2007-03-12Next step: see if the hang returns with a partial restoration ofWayne Davison1-1/+1
protocol 30.
2007-03-12It looks like some of the compile-farm hosts are hanging on this test,Wayne Davison1-5/+5
so let's try some remote-diagnostics (let's try protocol 29 first).
2006-02-03Decided I don't like "set -x".Wayne Davison1-2/+0
2005-02-26Decided I like "set -x" after all.Wayne Davison1-0/+2
2005-02-20Got rid of "set -x" (runtests.sh has a way to set this, if desired).Wayne Davison1-2/+0
2005-02-15Make sure that there are no directory-time differences between theWayne Davison1-3/+4
dirs that might trip up the check of the merged copy.
2005-02-13The dir vs non-dir test now assumes the dir wins.Wayne Davison1-4/+5
2005-02-13Added a test for the merging of a dir and a non-dir with the same name.Wayne Davison1-1/+3
2004-12-14Got rid of the rare failure caused by a directory-time mismatch.Wayne Davison1-1/+3
2004-05-18- Use $suitedir to find rsync.fns.Wayne Davison1-4/+1
- The values of fromdir, todir, and chkdir are already set.
2004-04-30Don't rely on the local shell's wildcard expansion to make the testWayne Davison1-2/+2
work right -- it might not be quite as compatible as we need.
2004-02-04Improved the trailing comment.Wayne Davison1-0/+1
2004-01-28OK, "find ... -print0 | xargs -0 ..." wasn't portable. This is.Wayne Davison1-1/+1
2004-01-28Got rid of indeterminacy in the overlapping-files.Wayne Davison1-7/+5
2004-01-27New test to make sure that merging files from multiple directoriesWayne Davison1-0/+52
continues to work.