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

------------------------------------------------------------
revno: 3890
revision-id: [email protected]
parent: [email protected]
committer: Vincent Ladeuil <[email protected]>
branch nick: log-deep
timestamp: Fri 2008-12-12 12:53:07 +0100
message:
  Comment out forgotten line.
=== modified file 'bzrlib/log.py'
--- a/bzrlib/log.py     2008-12-11 15:41:02 +0000
+++ b/bzrlib/log.py     2008-12-12 11:53:07 +0000
@@ -664,7 +664,7 @@
 
 #       use iter_changes from previous revision to current and filter from a
 #       path list.
-    return view_revisions
+#    return view_revisions
 
 def get_view_revisions(mainline_revs, rev_nos, branch, direction,
                        include_merges=True):

-- 
bazaar-commits mailing list
[email protected]
https://lists.ubuntu.com/mailman/listinfo/bazaar-commits

Reply via email to