At file:///net/bigmamac/Volumes/home/vila/src/bzr/cases/3232-spurious-conflict/
------------------------------------------------------------
revno: 3894
revision-id: [email protected]
parent: [email protected]
committer: Vincent Ladeuil <[email protected]>
branch nick: log-deep
timestamp: Mon 2008-12-15 19:11:57 +0100
message:
Add NEWS entry.
=== modified file 'NEWS'
--- a/NEWS 2008-12-12 12:14:01 +0000
+++ b/NEWS 2008-12-15 18:11:57 +0000
@@ -17,6 +17,12 @@
NEW FEATURES:
+ * ``bzr log`` now accepts a --deep option to look at files not present
+ anymore in the working tree. Be aware that the actual implementation is
+ slow as it needs to search all revisions, so restricting the required
+ revisions (as in providing ``-r-25..`` may help).
+ (Vincent Ladeuil, #175520)
+
* ``shelve --list`` can now be used to list shelved changes.
(Aaron Bentley)
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py 2008-12-15 15:43:46 +0000
+++ b/bzrlib/log.py 2008-12-15 18:11:57 +0000
@@ -635,7 +635,7 @@
# This needs to be logged, along with the extra revisions It's
# important to understand that the test above identify all the
# revisions that add or modify the given file-id but *not* the ones
- # that *remove* it.
+ # that *remove* it (that's bug #181520).
for idx in xrange(len(current_merge_stack)):
node = current_merge_stack[idx]
if node is not None:
--
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits
