Rev 3585: (trivial) Fix broken format string when raising AssertionError in in file:///home/pqm/archives/thelove/bzr/%2Btrunk/

[Canonical.com Patch Queue Manager]

At file:///home/pqm/archives/thelove/bzr/%2Btrunk/

------------------------------------------------------------
revno: 3585
revision-id:pqm at pqm.ubuntu.com-20080729005846-o7t0ck17azx0xddl
parent: pqm at pqm.ubuntu.com-20080729003054-v5qw7d5bbn1jtrj5
parent: andrew.bennetts at canonical.com-20080728071725-k0ol8cpay2w33j1x
committer: Canonical.com Patch Queue Manager <pqm at pqm.ubuntu.com>
branch nick: +trunk
timestamp: Tue 2008-07-29 01:58:46 +0100
message:
  (trivial) Fix broken format string when raising AssertionError in
  	_dirstate_helpers_py. (Andrew Bennetts)
modified:
  bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
    ------------------------------------------------------------
    revno: 3581.1.1
    revision-id:andrew.bennetts at canonical.com-20080728071725-k0ol8cpay2w33j1x
    parent: pqm at pqm.ubuntu.com-20080725151945-kdaru30ix1m8k0h6
    committer: Andrew Bennetts <andrew.bennetts at canonical.com>
    branch nick: trivial-assert-fix
    timestamp: Mon 2008-07-28 17:17:25 +1000
    message:
      Fix trivial bug in an AssertionError.
    modified:
      bzrlib/_dirstate_helpers_py.py _dirstate_helpers_py-20070710145033-90nz6cqglsk150jy-1
=== modified file 'bzrlib/_dirstate_helpers_py.py'
--- a/bzrlib/_dirstate_helpers_py.py	2008-05-08 04:12:06 +0000
+++ b/bzrlib/_dirstate_helpers_py.py	2008-07-28 07:17:25 +0000
@@ -201,7 +201,7 @@
     # Remove the last blank entry
     trailing = fields.pop()
     if trailing != '':
-        raise AssertionError("dirstate line %r has trailing garbage: %r" 
+        raise AssertionError("dirstate file has trailing garbage: %r"
             % (trailing,))
     # consider turning fields into a tuple.