Rev 2312: Make assertion more verbose. in http://people.samba.org/bzr/jelmer/bzr-svn/0.5

[Jelmer Vernooij]

At http://people.samba.org/bzr/jelmer/bzr-svn/0.5

------------------------------------------------------------
revno: 2312
revision-id: jelmer at samba.org-20090115204911-j3t3o2n41do77m02
parent: jelmer at samba.org-20090115204716-zvhqcc5qyq695fg4
committer: Jelmer Vernooij <jelmer at samba.org>
branch nick: 0.5
timestamp: Thu 2009-01-15 21:49:11 +0100
message:
  Make assertion more verbose.
modified:
  revmeta.py                     revmeta.py-20080901215045-n8a6arqybs9ez5hl-1
=== modified file 'revmeta.py'
--- a/revmeta.py	2009-01-15 20:47:16 +0000
+++ b/revmeta.py	2009-01-15 20:49:11 +0000
@@ -1050,7 +1050,8 @@
                     if new_name in self._metabranches:
                         if self._metabranches[new_name]._revs:
                             rev = self._metabranches[new_name]._revs[-1]
-                            assert rev.branch_path == new_name
+                            if rev.branch_path != new_name:
+                                raise AssertionError("Revision %d has invalid branch path %s, expected %s" % (revnum, rev.branch_path, new_name))
                             rev._set_direct_lhs_parent_revmeta(None)
                         del self._metabranches[new_name]
                         if new_name in metabranches_history[revnum]: