Rev 166: Avoid use of deprecated WorkingTree.iter_conflicts(). in file:///home/jelmer/bzr/pqm/

[Jelmer Vernooij]

At file:///home/jelmer/bzr/pqm/

------------------------------------------------------------
revno: 166
revision-id: jelmer at samba.org-20070520232746-l4mby8zzamu564sv
parent: jelmer at samba.org-20070520013651-yf069b1rv3iz87yy
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: pqm
timestamp: Mon 2007-05-21 00:27:46 +0100
message:
  Avoid use of deprecated WorkingTree.iter_conflicts().
modified:
  pqm/__init__.py                i_dc99ede3-0c64-434d-ac84-305c06455a8d
  pqm/tests/test_pqm.py          x_Robert_Collins_<robert.collins at canonical.com>_Thu_Aug__4_22:52:41_2005_804.0
=== modified file 'pqm/__init__.py'
--- a/pqm/__init__.py	2007-05-20 01:36:51 +0000
+++ b/pqm/__init__.py	2007-05-20 23:27:46 +0000
@@ -1418,11 +1418,11 @@
         conflicts = merger.do_merge()
         merger.set_pending()
         if conflicts:
-            error_lines = ['Conflicts during merge: %s' % conflicts]
+            error_lines = ['Conflicts during merge: ']
             tree.lock_read()
             try:
-                for path in tree.iter_conflicts():
-                    error_lines.append(path)
+                for conflict in tree.conflicts():
+                    error_lines.append(str(conflict))
             finally:
                 tree.unlock()
             raise PQMTlaFailure(sender, error_lines)

=== modified file 'pqm/tests/test_pqm.py'
--- a/pqm/tests/test_pqm.py	2006-03-22 12:32:36 +0000
+++ b/pqm/tests/test_pqm.py	2007-05-20 23:27:46 +0000
@@ -558,8 +558,8 @@
         try:
             handler.do_star_merge("me", "branch-contributor", "bzrbranch")
         except pqm.PQMTlaFailure, e:
-            self.assertEqual(["Conflicts during merge: 1",
-                              "README",
+            self.assertEqual(["Conflicts during merge: ",
+                              "Text conflict in README",
                               ],
                              e.output)
             return