Rev 3601: Fix up NEWS and version info to prepare 1.6rc2 in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/win32_enotdir

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/win32_enotdir

------------------------------------------------------------
revno: 3601
revision-id: john at arbash-meinel.com-20080813173534-0kb0kr70q505ihph
parent: john at arbash-meinel.com-20080813173115-mj34cv2uoxrnw32n
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: win32_enotdir
timestamp: Wed 2008-08-13 12:35:34 -0500
message:
  Fix up NEWS and version info to prepare 1.6rc2
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2008-08-13 17:31:15 +0000
+++ b/NEWS	2008-08-13 17:35:34 +0000
@@ -4,12 +4,11 @@
 
 .. contents::
 
-IN DEVELOPMENT
---------------
-
-  CHANGES:
-
-  IMPROVEMENTS:
+bzr 1.6rc2 2008-08-13
+---------------------
+
+This release candidate has a few minor bug fixes, and some regression
+fixes for Windows.
 
   BUG FIXES:
 
@@ -42,10 +41,6 @@
       choice is arbitrary but stable, so merges in different directions
       will get the same results.  (John Arbash Meinel, #232188)
 
-  API CHANGES:
-
-  INTERNALS:
-
 
 bzr 1.6rc1 2008-08-06
 ---------------------
@@ -61,7 +56,7 @@
     * Knit format repositories are deprecated and bzr will now emit
       warnings whenever it encounters one.  Use ``bzr upgrade`` to upgrade
       knit repositories to pack format.  (Andrew Bennetts)
-      
+
   IMPROVEMENTS:
 
     * ``bzr check`` can now be told which elements at a location it should

=== modified file 'bzr'
--- a/bzr	2008-08-06 08:23:43 +0000
+++ b/bzr	2008-08-13 17:35:34 +0000
@@ -22,7 +22,7 @@
 import sys
 
 # update this on each release
-_script_version = (1, 7, 0)
+_script_version = (1, 6, 0)
 
 if __doc__ is None:
     print "bzr does not support python -OO."

=== modified file 'bzrlib/__init__.py'
--- a/bzrlib/__init__.py	2008-08-06 08:23:43 +0000
+++ b/bzrlib/__init__.py	2008-08-13 17:35:34 +0000
@@ -41,7 +41,7 @@
 # Python version 2.0 is (2, 0, 0, 'final', 0)."  Additionally we use a
 # releaselevel of 'dev' for unreleased under-development code.
 
-version_info = (1, 7, 0, 'dev', 0)
+version_info = (1, 6, 0, 'candidate', 2)
 
 
 # API compatibility version: bzrlib is currently API compatible with 1.6.