← Back to branch summary

~abentley/bzrtools/bzrtools.dev

~abentley/bzrtools/bzrtools.dev

« back to all changes in this revision

Viewing changes to errors.py

Committer: Aaron Bentley
Date: 2008-11-12 03:00:42 UTC
Revision ID: aaron@aaronbentley.com-20081112030042-sqhfrqyf32w4ym09

More shelf test fixes

files added:
clean_tree.py

tests/clean_tree.py

files removed:
conflict_diff.py

mirror.py

tests/test_conflict_diff.py

tests/test_fetch_ghosts.py

tests/test_mirror.py

files modified:
INSTALL

NEWS

README

__init__.py

bzrtools.py

colordiff.py

command_classes.py

errors.py

fetch_ghosts.py

graph.py

release.py

shell.py

terminal.py

tests/blackbox.py

tests/shelf_tests.py

tests/upstream_import.py

upstream_import.py

userinteractor.py

version.py

Show diffs side-by-side

added added

removed removed

74

74

class ChangedBinaryFiles(BzrError):

75

75

76

76

_fmt = 'Changes involve binary files.'

77

78

79

class NoConflictFiles(CommandError):

80

81

_fmt = '%(base_name)s does not exist and there are no pending merges.'

82

83

def __init__(self, base_name):

84

CommandError.__init__(self, base_name=base_name)

Older »