← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Martin Pool
  • Date: 2005-07-13 05:34:13 UTC
  • Revision ID: mbp@sourcefrog.net-20050713053413-4322aac24fdc8800
- patch for merge-revert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
1402
1402
    def run(self, revision=None):
1403
1403
        from bzrlib.merge import merge
1404
1404
        if revision is None:
1405
 
            revision = -1
 
1405
            revision = [-1]
1406
1406
        elif len(revision) != 1:
1407
1407
            raise BzrCommandError('bzr merge-revert --revision takes exactly 1 argument')
1408
1408
        merge(('.', revision[0]), parse_spec('.'),