At http://bzr.arbash-meinel.com/branches/bzr/1.7-dev/merge_lca_multi
------------------------------------------------------------ revno: 3570 revision-id: [EMAIL PROTECTED] parent: [EMAIL PROTECTED] committer: John Arbash Meinel <[EMAIL PROTECTED]> branch nick: merge_lca_multi timestamp: Wed 2008-09-24 07:57:29 -0500 message: NEWS for 1.7.1rc1
=== 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 ------------------
-- bazaar-commits mailing list [email protected] https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
