Rev 6: Add a mutter so we know what file we are processing. in http://bzr.arbash-meinel.com/plugins/per_file_remerge

[John Arbash Meinel]

At http://bzr.arbash-meinel.com/plugins/per_file_remerge

------------------------------------------------------------
revno: 6
revision-id: john at arbash-meinel.com-20080618150645-yjm7co1x5i6whdac
parent: john at arbash-meinel.com-20080618150604-agwb2hp79jfckpw5
committer: John Arbash Meinel <john at arbash-meinel.com>
branch nick: per_file_remerge
timestamp: Wed 2008-06-18 10:06:45 -0500
message:
  Add a mutter so we know what file we are processing.
-------------- next part --------------
=== modified file '__init__.py'
--- a/__init__.py	2008-06-18 14:02:30 +0000
+++ b/__init__.py	2008-06-18 15:06:45 +0000
@@ -65,6 +65,7 @@
                 num_conflicted = len(relpaths)
                 for idx, relpath in enumerate(relpaths):
                     pb.update('resolving', idx, num_conflicted)
+                    trace.mutter('processing file: %s', relpath)
                     num_conflicts += per_file_remerge._remerge_file(tree,
                                         relpath, merge_type)
             finally: