← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-06-29 18:21:57 UTC
  • mfrom: (1711.2.72 jam-integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060629182157-cdc39b5f9e4fac85
(jam) add run_bzr_error, clean up remerge tests

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)