← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

Add run_bzr_errors alongside run_bzr, to make it easy to check the right error is occurring.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
2178
2178
            pending_merges = tree.pending_merges() 
2179
2179
            if len(pending_merges) != 1:
2180
2180
                raise BzrCommandError("Sorry, remerge only works after normal"
2181
 
                                      + " merges.  Not cherrypicking or"
2182
 
                                      + "multi-merges.")
 
2181
                                      " merges.  Not cherrypicking or"
 
2182
                                      " multi-merges.")
2183
2183
            repository = tree.branch.repository
2184
2184
            base_revision = common_ancestor(tree.branch.last_revision(), 
2185
2185
                                            pending_merges[0], repository)