← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: aaron.bentley at utoronto
  • Date: 2005-07-15 01:56:29 UTC
  • mto: This revision was merged to the branch mainline in revision 923.
  • Revision ID: aaron.bentley@utoronto.ca-20050715015629-cff74c300400f1a7
Fixed handling of merge-revert with no --revision

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
1394
1394
    def run(self, revision=None):
1395
1395
        from bzrlib.merge import merge
1396
1396
        if revision is None:
1397
 
            revision = -1
 
1397
            revision = [-1]
1398
1398
        elif len(revision) != 1:
1399
1399
            raise BzrCommandError('bzr merge-revert --revision takes exactly 1 argument')
1400
1400
        merge(('.', revision[0]), parse_spec('.'),