index
:
delta/rsync.git
b3.0.x
baserock/morph
cvs/branch-2.3
cvs/branch-2.4
cvs/branch-2.5
cvs/branch-2.6.6
cvs/branch-before.2.6
cvs/branch-mbp-merge-rsync+
cvs/branch-mbp-privacy
cvs/branch-mbp-rsyncplus_merge
cvs/branch-mbp-texinfo
cvs/branch-merge-rsync+-2.4.7
cvs/bugfix-2.6.5
master
git.samba.org: rsync.git
summary
refs
log
tree
commit
diff
log msg
author
committer
range
path:
root
/
testsuite
/
merge.test
Commit message (
Expand
)
Author
Age
Files
Lines
*
Preparing for release of 3.2.4pre2
v3.2.4pre2
Wayne Davison
2022-01-15
1
-1
/
+1
*
Preparing for release of 3.2.4pre1
v3.2.4pre1
Wayne Davison
2022-01-02
1
-1
/
+1
*
Minor cleanup (#214)
a1346054
2021-09-26
1
-1
/
+1
*
Convert a couple files to UTF-8; more Copyright years.
Wayne Davison
2020-06-13
1
-1
/
+1
*
Avoid problems with timestamp rounding that cp -p and touch -r may do.
Wayne Davison
2008-06-17
1
-8
/
+8
*
- Made the itemize test check for CAN_HARDLINK_SYMLINK define instead
Wayne Davison
2008-03-04
1
-1
/
+1
*
Changed verbosity back from -vvvv to -vv.
Wayne Davison
2007-05-25
1
-1
/
+1
*
Be more verbose so that we can debug what is going wrong on solaris.
Wayne Davison
2007-05-22
1
-1
/
+1
*
Added a "sleep 1" to make certain failures more reproducible.
Wayne Davison
2007-04-29
1
-0
/
+3
*
Got rid of the --no-ir kluge in this test.
Wayne Davison
2007-04-26
1
-2
/
+1
*
Specify an arg sequence that was recently failing to work.
Wayne Davison
2007-04-24
1
-3
/
+6
*
Use relative directories, and note that the merge code is only
Wayne Davison
2007-03-18
1
-33
/
+33
*
I managed to duplicate the hang, so hopefully it's fixed now.
Wayne Davison
2007-03-14
1
-4
/
+4
*
Next step: allow protocol 30 to be used, but disallow the use
Wayne Davison
2007-03-14
1
-4
/
+4
*
Next step: see if the hang returns with a partial restoration of
Wayne Davison
2007-03-12
1
-1
/
+1
*
It looks like some of the compile-farm hosts are hanging on this test,
Wayne Davison
2007-03-12
1
-5
/
+5
*
Decided I don't like "set -x".
Wayne Davison
2006-02-03
1
-2
/
+0
*
Decided I like "set -x" after all.
Wayne Davison
2005-02-26
1
-0
/
+2
*
Got rid of "set -x" (runtests.sh has a way to set this, if desired).
Wayne Davison
2005-02-20
1
-2
/
+0
*
Make sure that there are no directory-time differences between the
Wayne Davison
2005-02-15
1
-3
/
+4
*
The dir vs non-dir test now assumes the dir wins.
Wayne Davison
2005-02-13
1
-4
/
+5
*
Added a test for the merging of a dir and a non-dir with the same name.
Wayne Davison
2005-02-13
1
-1
/
+3
*
Got rid of the rare failure caused by a directory-time mismatch.
Wayne Davison
2004-12-14
1
-1
/
+3
*
- Use $suitedir to find rsync.fns.
Wayne Davison
2004-05-18
1
-4
/
+1
*
Don't rely on the local shell's wildcard expansion to make the test
Wayne Davison
2004-04-30
1
-2
/
+2
*
Improved the trailing comment.
Wayne Davison
2004-02-04
1
-0
/
+1
*
OK, "find ... -print0 | xargs -0 ..." wasn't portable. This is.
Wayne Davison
2004-01-28
1
-1
/
+1
*
Got rid of indeterminacy in the overlapping-files.
Wayne Davison
2004-01-28
1
-7
/
+5
*
New test to make sure that merging files from multiple directories
Wayne Davison
2004-01-27
1
-0
/
+52