Change the default of --modify-window back to 0 on Cygwin.

diff --git a/NEWS b/NEWS
index 7ccf332..1a93c73 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -31,9 +31,6 @@ rsync changes since last release
     * Properly support IPv6 addresses in the rsyncd.conf "hosts allow"
       and "hosts deny" fields.  (Hideaki Yoshifuji)
 
     * Properly support IPv6 addresses in the rsyncd.conf "hosts allow"
       and "hosts deny" fields.  (Hideaki Yoshifuji)
 

-    * Set the default value of --modify-window to 1 on Cygwin.  (Lapo
-      Luchini)
-

     * Changed exclude file handling to permit DOS or MAC style line
       terminations.  (J.W. Schultz)
 
     * Changed exclude file handling to permit DOS or MAC style line
       terminations.  (J.W. Schultz)
 

diff --git a/configure.in b/configure.in
index d0002c1..d01bea7 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -247,15 +247,6 @@ yes
        AC_SEARCH_LIBS(getaddrinfo, inet6)
 fi
 
        AC_SEARCH_LIBS(getaddrinfo, inet6)
 fi
 

-AC_MSG_CHECKING([default value for --modify-window])
-case $host_os in
-       *cygwin* ) DEFAULT_MODIFY_WINDOW=${DEFAULT_MODIFY_WINDOW:-1};;
-              * ) DEFAULT_MODIFY_WINDOW=${DEFAULT_MODIFY_WINDOW:-0};;
-esac
-AC_MSG_RESULT($DEFAULT_MODIFY_WINDOW)
-AC_DEFINE_UNQUOTED(DEFAULT_MODIFY_WINDOW, $DEFAULT_MODIFY_WINDOW,
-       [Set to the default value for the --modify-window option])
-

 AC_MSG_CHECKING([whether to call shutdown on all sockets])
 case $host_os in
        *cygwin* ) AC_MSG_RESULT(yes)
 AC_MSG_CHECKING([whether to call shutdown on all sockets])
 case $host_os in
        *cygwin* ) AC_MSG_RESULT(yes)

diff --git a/options.c b/options.c
index 3bfd833..af43be7 100644 (file)
--- a/options.c
+++ b/options.c
@@ -81,7 +81,7 @@ int only_existing=0;
 int opt_ignore_existing=0;
 int max_delete=0;
 int ignore_errors=0;
 int opt_ignore_existing=0;
 int max_delete=0;
 int ignore_errors=0;

-int modify_window=DEFAULT_MODIFY_WINDOW;
+int modify_window=0;

 int blocking_io=-1;
 
 
 int blocking_io=-1;
 
 

diff --git a/rsync.yo b/rsync.yo
index 8d68958..0b2ec98 100644 (file)
--- a/rsync.yo
+++ b/rsync.yo
@@ -396,8 +396,8 @@ dit(bf(--modify-window)) When comparing two timestamps rsync treats
 the timestamps as being equal if they are within the value of
 modify_window. This is normally zero, but you may find it useful to
 set this to a larger value in some situations. In particular, when
 the timestamps as being equal if they are within the value of
 modify_window. This is normally zero, but you may find it useful to
 set this to a larger value in some situations. In particular, when

-transferring to/from FAT filesystems which cannot represent times with
-a 1 second resolution this option is useful.
+transferring to Windows FAT filesystems which cannot represent times
+with a 1 second resolution --modify-window=1 is useful.

 
 dit(bf(-c, --checksum)) This forces the sender to checksum all files using
 a 128-bit MD4 checksum before transfer. The checksum is then
 
 dit(bf(-c, --checksum)) This forces the sender to checksum all files using
 a 128-bit MD4 checksum before transfer. The checksum is then


@@ -1110,16 +1110,17 @@ manpagebugs()
 
 times are transferred as unix time_t values
 
 
 times are transferred as unix time_t values
 

+When transferring to FAT filesystmes rsync may resync
+unmodified files.
+See the comments on the --modify-window option.
+

 file permissions, devices etc are transferred as native numerical
 values
 
 see also the comments on the --delete option
 
 file permissions, devices etc are transferred as native numerical
 values
 
 see also the comments on the --delete option
 

-Please report bugs! The rsync bug tracking system is online at
-url(http://rsync.samba.org/rsync/)(http://rsync.samba.org/rsync/)
-
-manpagesection(VERSION)
-This man page is current for version 2.0 of rsync
+Please report bugs! See the website at
+url(http://rsync.samba.org/)(http://rsync.samba.org/)

 
 manpagesection(CREDITS)
 
 
 manpagesection(CREDITS)
 

diff --git a/testsuite/rsync.fns b/testsuite/rsync.fns
index 5e76538..42b7b7e 100644 (file)
--- a/testsuite/rsync.fns
+++ b/testsuite/rsync.fns
@@ -140,10 +140,6 @@ makepath () {
 # should be excluded, you might need to use something else.
 
 checkit() {
 # should be excluded, you might need to use something else.
 
 checkit() {

-    # sleep here to prevent a copy from being made within the
-    #  default --modify-window time on Cygwin
-    sleep 2
-

     failed=
 
     # We can just write everything to stdout/stderr, because the
     failed=
 
     # We can just write everything to stdout/stderr, because the