← 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-08-25 02:30:04 UTC
  • mto: (1092.1.41) (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: aaron.bentley@utoronto.ca-20050825023004-581548615ae1066d
Made revert clear pending-merges

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
1518
1518
 
1519
1519
    def run(self, revision=None, no_backup=False, file_list=None):
1520
1520
        from bzrlib.merge import merge
 
1521
        from bzrlib.branch import Branch
1521
1522
        if file_list is not None:
1522
1523
            if len(file_list) == 0:
1523
1524
                raise BzrCommandError("No files specified")
1530
1531
              ignore_zero=True,
1531
1532
              backup_files=not no_backup,
1532
1533
              file_list=file_list)
 
1534
        if not file_list:
 
1535
            Branch('.').set_pending_merges([])
1533
1536
 
1534
1537
 
1535
1538
class cmd_assert_fail(Command):