Rev 3468: Update news for IN DEVELOPMENT in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/status_double_pending_235407

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 3468
revision-id: john at arbash-meinel.com-20080604175630-tngg9jlwn6jzebgv
parent: john at arbash-meinel.com-20080604175452-l0iwbtdlkdrbpnjc
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: status_double_pending_235407
timestamp: Wed 2008-06-04 12:56:30 -0500
message:
  Update news for IN DEVELOPMENT
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2008-06-04 17:54:52 +0000
+++ b/NEWS	2008-06-04 17:56:30 +0000
@@ -5,6 +5,23 @@
 .. contents::
 
 
+IN DEVELOPMENT
+--------------
+
+  BUGFIXES:
+
+    * ``bzr status`` was breaking if you merged the same revision twice.
+      (John Arbash Meinel, #235407)
+
+  API CHANGES:
+
+    * ``WorkingTree.set_parent_(ids/trees)`` will now filter out revisions
+      which are in the ancestry of other revisions. So if you merge the same
+      tree twice, or merge an ancestor of an existing merge, it will only
+      record the newest. (If you merge a descendent, it will replace its
+      ancestor). (John Arbash Meinel, #235407)
+
+
 bzr 1.6beta1 2008-06-02
 -----------------------