Rev 3901: Merge delta-show-with-path-filter into log-deep in file:///net/bigmamac/Volumes/home/vila/src/bzr/cases/3232-spurious-conflict/

[Vincent Ladeuil]

At file:///net/bigmamac/Volumes/home/vila/src/bzr/cases/3232-spurious-conflict/

------------------------------------------------------------
revno: 3901
revision-id: v.ladeuil+lp at free.fr-20090115155859-wkkdejqu85hwbme6
parent: v.ladeuil+lp at free.fr-20090114123711-5xk3p23fa341ykgr
parent: v.ladeuil+lp at free.fr-20090115145742-ro6mpyevizrx9j6z
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: log-deep
timestamp: Thu 2009-01-15 16:58:59 +0100
message:
  Merge delta-show-with-path-filter into log-deep
modified:
  NEWS                           NEWS-20050323055033-4e00b5db738777ff
    ------------------------------------------------------------
    revno: 3884.1.6
    revision-id: v.ladeuil+lp at free.fr-20090115145742-ro6mpyevizrx9j6z
    parent: v.ladeuil+lp at free.fr-20090114122756-mfpfhyva3arncxfh
    committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
    branch nick: delta-show-with-path-filter
    timestamp: Thu 2009-01-15 15:57:42 +0100
    message:
      Add NEWS entry.
    modified:
      NEWS                           NEWS-20050323055033-4e00b5db738777ff
-------------- next part --------------
=== modified file 'NEWS'
--- a/NEWS	2009-01-14 12:37:11 +0000
+++ b/NEWS	2009-01-15 15:58:59 +0000
@@ -38,6 +38,9 @@
 
   INTERNALS:
 
+    * ``TreeDelta.show()`` now accepts a ``filter`` parameter allowing log
+      formatters to retrict the output.
+      (Vincent Ladeuil)
 
 bzr 1.11rc1 "Eyes up!" 2009-01-09
 ---------------------------------