Beginning work on a 3.0.7 release.

diff --git a/NEWS b/NEWS
index 5740b109d372a5cfbe148956b4294f29c0f8fc95..84d9417a808f1291ec2b44dd3aa228e7f0057bf5 100644 (file)
--- a/NEWS
+++ b/NEWS
@@ -1,55 +1,15 @@
-NEWS for rsync 3.0.6 (8 May 2009)
+NEWS for rsync 3.0.7 (UNRELEASED)
 Protocol: 30 (unchanged)
-Changes since 3.0.5:
+Changes since 3.0.6:
 
   BUG FIXES:
 
-    - Fixed a --read-batch hang when rsync is reading a batch file that was
-      created from an incremental-recursion transfer.
+    - Fixed a bogus free when using --xattrs with --backup.
 
-    - Fixed the daemon's socket code to handle the simultaneous arrival of
-      multiple connections.
+    - Avoid an error when --dry-run  was trying to stat a prior hard-link file
+      that hasn't really been created.
 
-    - Fix --safe-links/--copy-unsafe-links to properly handle symlinks that
-      have consecutive slashes in the value.
+    - Improved --skip-compress's error handling of bad character sets and got
+      rid of a lingering debug fprintf().
 
-    - Fixed the parsing of an [IPv6_LITERAL_ADDR] when a USER@ is prefixed.
-
-    - The sender now skips a (bogus) symlink that has a 0-length value, which
-      avoids a transfer error in the receiver.
-
-    - Fixed a case where the sender could die with a tag-0 error if there was
-      an I/O during the sending of the file list.
-
-    - Fixed the rrsync script to avoid a server-side problem when -e is at the
-      start of the short options.
-
-    - Fixed a problem where a vanished directory could turn into an exit code
-      23 instead of the proper exit code 24.
-
-    - Fixed the --iconv conversion of symlinks when doing a local copy.
-
-    - Fixed a problem where --one-file-system was not stopping deletions on the
-      receiving side when a mount-point directory did not match a directory in
-      the transfer.
-
-    - Fixed the dropping of an ACL mask when no named ACL values were present.
-
-    - Fixed an ACL/xattr corruption issue where the --backup option could cause
-      rsync to associate the wrong ACL/xattr information with received files.
-
-    - Fixed the use of --xattrs with --only-write-batch.
-
-    - Fixed the use of --dry-run with --read-batch.
-
-    - Fixed configure's erroneous use of target.
-
-    - Fixed configure's --disable-debug option.
-
-    - Fixed a run-time issue for systems that can't find iconv_open() by adding
-      the --disable-iconv-open configure option.
-
-    - Complain and die if the user tries to combine --remove-source-files (or
-      the deprecated --remove-sent-files) with --read-batch.
-
-    - Fixed an failure transferring special files from Solaris to Linux.
+    - Fixed the daemon's conveyance of io_error value from the sender.

diff --git a/OLDNEWS b/OLDNEWS
index 4b5e9669932e7f036af5b4b980bc694d00df9d75..90260f4d7adbb14cb2ea7f62d05e2fdd606103e8 100644 (file)
--- a/OLDNEWS
+++ b/OLDNEWS
@@ -1,3 +1,60 @@
+NEWS for rsync 3.0.6 (8 May 2009)
+Protocol: 30 (unchanged)
+Changes since 3.0.5:
+
+  BUG FIXES:
+
+    - Fixed a --read-batch hang when rsync is reading a batch file that was
+      created from an incremental-recursion transfer.
+
+    - Fixed the daemon's socket code to handle the simultaneous arrival of
+      multiple connections.
+
+    - Fix --safe-links/--copy-unsafe-links to properly handle symlinks that
+      have consecutive slashes in the value.
+
+    - Fixed the parsing of an [IPv6_LITERAL_ADDR] when a USER@ is prefixed.
+
+    - The sender now skips a (bogus) symlink that has a 0-length value, which
+      avoids a transfer error in the receiver.
+
+    - Fixed a case where the sender could die with a tag-0 error if there was
+      an I/O during the sending of the file list.
+
+    - Fixed the rrsync script to avoid a server-side problem when -e is at the
+      start of the short options.
+
+    - Fixed a problem where a vanished directory could turn into an exit code
+      23 instead of the proper exit code 24.
+
+    - Fixed the --iconv conversion of symlinks when doing a local copy.
+
+    - Fixed a problem where --one-file-system was not stopping deletions on the
+      receiving side when a mount-point directory did not match a directory in
+      the transfer.
+
+    - Fixed the dropping of an ACL mask when no named ACL values were present.
+
+    - Fixed an ACL/xattr corruption issue where the --backup option could cause
+      rsync to associate the wrong ACL/xattr information with received files.
+
+    - Fixed the use of --xattrs with --only-write-batch.
+
+    - Fixed the use of --dry-run with --read-batch.
+
+    - Fixed configure's erroneous use of target.
+
+    - Fixed configure's --disable-debug option.
+
+    - Fixed a run-time issue for systems that can't find iconv_open() by adding
+      the --disable-iconv-open configure option.
+
+    - Complain and die if the user tries to combine --remove-source-files (or
+      the deprecated --remove-sent-files) with --read-batch.
+
+    - Fixed an failure transferring special files from Solaris to Linux.
+
+\f
 NEWS for rsync 3.0.5 (28 Dec 2008)
 Protocol: 30 (unchanged)
 Changes since 3.0.4:
@@ -2971,6 +3028,7 @@ Changes since 2.4.6:
 \f
 Partial Protocol History
        RELEASE DATE    VER.    DATE OF COMMIT* PROTOCOL
+       ?? Dec 2009     3.0.7                   30
        08 May 2009     3.0.6                   30
        28 Dec 2008     3.0.5                   30
        06 Sep 2008     3.0.4                   30

diff --git a/configure.in b/configure.in
index 91fbaf6632a78599cd4700d25bf2a03678125596..ee0c0a645b080282a84367878529fb00a0c6055f 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -5,7 +5,7 @@ AC_CONFIG_SRCDIR([byteorder.h])
 AC_CONFIG_HEADER(config.h)
 AC_PREREQ(2.59)
 
-RSYNC_VERSION=3.0.6
+RSYNC_VERSION=3.0.7dev
 AC_SUBST(RSYNC_VERSION)
 AC_MSG_NOTICE([Configuring rsync $RSYNC_VERSION])