-
Committer:
Rodney Dawes
-
Date:
2010-09-17 21:57:28 UTC
-
mto:
This revision was merged to the branch mainline in
revision
356.
-
Revision ID:
rodney.dawes@canonical.com-20100917215728-d42585zxxx2aw6x9
Add a new TarmacMergeError exception class for handling merge-preventing errors
Simplify the _do_merges method to use TarmacMergeError
Move comment handling to the point of exception raising
Replace some exceptions with ones derived from TarmacMergeError
Improve some of the exception messages and launchpad comment strings
Document the handling of errors in the writing plug-ins documentation