Rev 3570: NEWS for 1.7.1rc1 in http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/merge_lca_multi

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/merge_lca_multi

------------------------------------------------------------
revno: 3570
revision-id: john at arbash-meinel.com-20080924125729-l5edidgaus6lq6zv
parent: john at arbash-meinel.com-20080924125322-p1i7pnr0m49v1hze
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: merge_lca_multi
timestamp: Wed 2008-09-24 07:57:29 -0500
message:
  NEWS for 1.7.1rc1
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2008-09-23 16:14:54 +0000
+++ b/NEWS	2008-09-24 12:57:29 +0000
@@ -4,6 +4,21 @@
 
 .. contents::
 
+bzr 1.7.1rc1 2008-09-24
+-----------------------
+
+This release just includes an update to how the merge algorithm handles
+file paths when we encounter complex history.
+
+  FEATURES:
+
+    * If we encounter a criss-cross in history, use information from
+      direct Least Common Ancestors to resolve inventory shape (locations
+      of files, adds, deletes, etc). This is similar in concept to using
+      ``--lca`` for merging file texts, only applied to paths.
+      (John Arbash Meinel)
+
+
 bzr 1.7 2008-09-23
 ------------------