Rev 6056: Turn MalformedTransform into an InternalBzrError so users get a traceback. in file:///home/vila/src/bzr/bugs/880701-resolve-duplicate/

[Vincent Ladeuil]

At file:///home/vila/src/bzr/bugs/880701-resolve-duplicate/

------------------------------------------------------------
revno: 6056
revision-id: v.ladeuil+lp at free.fr-20111024151509-uo7gww58ssxh4nkz
parent: pqm at pqm.ubuntu.com-20111018073555-xk677r8n7cprtvco
committer: Vincent Ladeuil <v.ladeuil+lp at free.fr>
branch nick: 880701-resolve-duplicate
timestamp: Mon 2011-10-24 17:15:09 +0200
message:
  Turn MalformedTransform into an InternalBzrError so users get a traceback.
-------------- next part --------------
=== modified file 'bzrlib/errors.py'
--- a/bzrlib/errors.py	2011-08-01 06:24:48 +0000
+++ b/bzrlib/errors.py	2011-10-24 15:15:09 +0000
@@ -1964,7 +1964,7 @@
         self.prefix = prefix
 
 
-class MalformedTransform(BzrError):
+class MalformedTransform(InternalBzrError):
 
     _fmt = "Tree transform is malformed %(conflicts)r"
 

=== modified file 'bzrlib/tests/test_conflicts.py'
--- a/bzrlib/tests/test_conflicts.py	2011-07-07 10:20:59 +0000
+++ b/bzrlib/tests/test_conflicts.py	2011-10-24 15:15:09 +0000
@@ -1043,7 +1043,8 @@
         # This is nearly like TestResolveNonDirectoryParent but with branch and
         # trunk switched. As such it should certainly produce the same
         # conflict.
-        self.run_script("""
+        self.assertRaises(errors.MalformedTransform,
+                          self.run_script,"""
 $ bzr init trunk
 ...
 $ cd trunk