← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

merge from abently, take his fixes for merge in preference

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
1523
1523
            merge_type = ApplyMerge3
1524
1524
 
1525
1525
        if revision is None or len(revision) < 1:
1526
 
            base = (None, "auto")
 
1526
            base = [None, None]
1527
1527
            other = (branch, -1)
1528
1528
        else:
1529
1529
            if len(revision) == 1:
1553
1553
 
1554
1554
    def run(self, revision=None, no_backup=False, file_list=None):
1555
1555
        from bzrlib.merge import merge
 
1556
        from bzrlib.branch import Branch
1556
1557
        if file_list is not None:
1557
1558
            if len(file_list) == 0:
1558
1559
                raise BzrCommandError("No files specified")
1565
1566
              ignore_zero=True,
1566
1567
              backup_files=not no_backup,
1567
1568
              file_list=file_list)
 
1569
        if not file_list:
 
1570
            Branch('.').set_pending_merges([])
1568
1571
 
1569
1572
 
1570
1573
class cmd_assert_fail(Command):