patch confict should be an internal error

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On IRC the attached traceback was just reported.
It seems like the text patch was munged somehow (tabs turned to spaces, or
somesuch). And this caused the text checker to assert that there was a patch
conflict.

While I think the Conflict is probably correct, it seems like this should not
be an internal_error=True, so that we don't get the full traceback.

John
=:->

└─(~/work/kubuntu-theme-v1)-> bzr merge mhb.changes
bzr: ERROR: bzrlib.patches.PatchConflict: Text contents mismatch at line 18.
Original has " <div id="container">", but patch says it should be "
<div id="container">"

Traceback (most recent call last):
 File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 817, in
run_bzr_catch_errors
   return run_bzr(argv)
 File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 779, in run_bzr
   ret = run(*run_argv)
 File "/usr/lib/python2.5/site-packages/bzrlib/commands.py", line 477, in
run_argv_aliases
   return self.run(**all_cmd_args)
 File "/usr/lib/python2.5/site-packages/bzrlib/builtins.py", line 2724, in run
   mergeable, pb)
 File "/usr/lib/python2.5/site-packages/bzrlib/merge.py", line 114, in
from_mergeable
   mergeable.install_revisions(tree.branch.repository)
 File "/usr/lib/python2.5/site-packages/bzrlib/bundle/bundle_data.py", line
462, in install_revisions
   apply_bundle.install_bundle(target_repo, self)
 File "/usr/lib/python2.5/site-packages/bzrlib/bundle/apply_bundle.py", line
40, in install_bundle
   revision.revision_id)
 File "/usr/lib/python2.5/site-packages/bzrlib/bundle/bundle_data.py", line
209, in revision_tree
   inv = bundle_tree.inventory
 File "/usr/lib/python2.5/site-packages/bzrlib/bundle/bundle_data.py", line
733, in _get_inventory
   add_entry(file_id)
 File "/usr/lib/python2.5/site-packages/bzrlib/bundle/bundle_data.py", line
726, in add_entry
   ie.text_size, ie.text_sha1 = self.get_size_and_sha1(file_id)
 File "/usr/lib/python2.5/site-packages/bzrlib/bundle/bundle_data.py", line
685, in get_size_and_sha1
   content = fileobj.read()
 File "/usr/lib/python2.5/site-packages/bzrlib/iterablefile.py", line 193, in read
   return self._file_base.read_all()
 File "/usr/lib/python2.5/site-packages/bzrlib/iterablefile.py", line 85, in
read_all
   return self._read(no_stop)
 File "/usr/lib/python2.5/site-packages/bzrlib/iterablefile.py", line 69, in _read
   result += self._iter.next()
 File "/usr/lib/python2.5/site-packages/bzrlib/patches.py", line 406, in
iter_patched
   raise PatchConflict(line_no, orig_line, "".join(seen_patch))
PatchConflict: Text contents mismatch at line 18. Original has " <div
id="container">", but patch says it should be " <div id="container">"

bzr 0.90.0 on python 2.5.1.final.0 (linux2)
arguments: ['/usr/bin/bzr', 'merge', 'mhb.changes']

** please send this report to <email address hidden>
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.7 (Darwin)
Comment: Using GnuPG with Mozilla - http://enigmail.mozdev.org

iD8DBQFHGRZyJdeBCYSNAAMRAg2/AKCT/HjYWDw2BiHuaoFCwoCylbzDXwCdFJOq
d7Z0/9tYikGIY5UYlE3a3Ag=
=tQSX
-----END PGP SIGNATURE-----