Rev 3393: NEWS about fixing bug #177855 in http://bzr.arbash-meinel.com/branches/bzr/1.5-dev/reconcile_rev_history_177855

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.5-dev/reconcile_rev_history_177855

------------------------------------------------------------
revno: 3393
revision-id: john at arbash-meinel.com-20080429163438-scr993idmrty20bv
parent: john at arbash-meinel.com-20080429163158-hui1lprno5hd18pv
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: reconcile_rev_history_177855
timestamp: Tue 2008-04-29 11:34:38 -0500
message:
  NEWS about fixing bug #177855
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2008-04-28 06:24:16 +0000
+++ b/NEWS	2008-04-29 16:34:38 +0000
@@ -29,6 +29,10 @@
     * Avoid muttering every time a child update does not cause a progress bar
       update. (John Arbash Meinel, #213771)
 
+    * ``Branch.reconcile()`` is now implemented. This allows ``bzr reconcile``
+      to fix when a Branch has a non-canonical mainline history. ``bzr check``
+      also detects this condition. (John Arbash Meinel, #177855)
+
     * ``bzr commit`` now works with Microsoft's FTP service.
       (Andreas Deininger)