← 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-06-07 07:04:20 UTC
  • Revision ID: mbp@sourcefrog.net-20050607070420-8268f207bb679fd1
- fix missing import in revert

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
1140
1140
    takes_options = ['revision']
1141
1141
 
1142
1142
    def run(self, revision=-1):
 
1143
        from bzrlib.merge import merge
1143
1144
        merge(('.', revision), parse_spec('.'),
1144
1145
              check_clean=False,
1145
1146
              ignore_zero=True)