← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

Better exception for one unhandled merge case

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset.py
32
32
from bzrlib.trace import mutter, warning
33
33
from bzrlib.osutils import rename, sha_file
34
34
import bzrlib
 
35
from bzrlib.errors import BzrCheckError
35
36
 
36
37
__docformat__ = "restructuredtext"
37
38
 
988
989
                rename(old_path, new_path)
989
990
                changed_inventory[entry.id] = new_tree_path
990
991
            except OSError, e:
991
 
                raise Exception ("%s is missing" % new_path)
 
992
                raise BzrCheckError('failed to rename %s to %s for changeset entry %s: %s'
 
993
                        % (old_path, new_path, entry, e))
992
994
 
993
995
class TargetExists(Exception):
994
996
    def __init__(self, entry, target):