Rev 3518: Update NEWS about bug #238895 in http://bzr.arbash-meinel.com/branches/bzr/1.6-dev/weave_merge

[John Arbash Meinel]

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

------------------------------------------------------------
revno: 3518
revision-id: john at arbash-meinel.com-20080709222235-t9xrdjyrbpk7vl8q
parent: john at arbash-meinel.com-20080709222057-ak05lten4u8q77gg
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: weave_merge
timestamp: Wed 2008-07-09 17:22:35 -0500
message:
  Update NEWS about bug #238895
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2008-06-26 06:06:49 +0000
+++ b/NEWS	2008-07-09 22:22:35 +0000
@@ -14,6 +14,11 @@
       to stdout; also ``tar`` and ``tbz2``.
       (Martin Pool)
 
+    * ``bzr (re)merge --weave`` will now use a real Weave algorithm,
+      rather than the annotation-based merged it was using. It does so by
+      building up a Weave of the important texts, without needing to build
+      the full ancestry. (John Arbash Meinel, #238895)
+
     * Remembered locations can be specified by aliases, e.g. :parent, :public,
       :submit.  (Aaron Bentley)