← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/commands.py

  • Committer: Robert Collins
  • Date: 2005-08-25 12:57:59 UTC
  • mto: (974.1.50) (1185.1.10) (1092.3.1)
  • mto: This revision was merged to the branch mainline in revision 1139.
  • Revision ID: robertc@robertcollins.net-20050825125759-5ea06cbf79464ef9
unbreak revert. gotta remember to check then commit

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, None)
 
1526
            base = (None, "auto")
1527
1527
            other = (branch, -1)
1528
1528
        else:
1529
1529
            if len(revision) == 1: