Rev 5425: Move NEWS entry to 2.3b2 in file:///home/vila/src/bzr/bugs/323111-orphans/
Vincent Ladeuil
v.ladeuil+lp at free.fr
Tue Sep 21 15:53:24 BST 2010
At file:///home/vila/src/bzr/bugs/323111-orphans/
------------------------------------------------------------
revno: 5425
revision-id: v.ladeuil+lp at free.fr-20100921145324-bkql2l1384ct38i0
parent: v.ladeuil+lp at free.fr-20100921145223-d6g4j81xqokh2jgo
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: orphan-non-versioned-files
timestamp: Tue 2010-09-21 16:53:24 +0200
message:
Move NEWS entry to 2.3b2
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS 2010-09-21 14:52:23 +0000
+++ b/NEWS 2010-09-21 14:53:24 +0000
@@ -26,6 +26,12 @@
Improvements
************
+* When a bzr command remove a previously versioned directory, all
+ unversioned files are moved to a 'bzr-orphans' directory at the working
+ tree root with backup names (<file>.~#~). This was previously creating
+ spurious conflicts during merge, pull or switch operations.
+ (Vincent Ladeuil, #323111)
+
Documentation
*************
@@ -361,12 +367,6 @@
have dropped from 68 bytes to 40, and directory entries from 120 bytes
to 48). (Andrew Bennetts)
-* When a bzr command remove a previously versioned directory, all
- unversioned files are moved to a 'bzr-orphans' directory at the working
- tree root with backup names (<file>.~#~). This was previously creating
- spurious conflicts during merge, pull or switch operations.
- (Vincent Ladeuil, #323111)
-
* When building new working trees, default to reading from the repository
rather than the source tree unless explicitly requested. (via
``--files-from`` and ``--hardlink`` for ``bzr branch`` and
More information about the bazaar-commits
mailing list