← 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
  • Date: 2005-08-26 12:38:57 UTC
  • mfrom: (974.1.45)
  • mto: (1185.3.4)
  • mto: This revision was merged to the branch mainline in revision 1178.
  • Revision ID: abentley@panoramicfeedback.com-20050826123857-06b8856e0fa2d374
Fixed ancestor-picking when -r is specified

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/commands.py
1489
1489
 
1490
1490
        if revision is None or len(revision) < 1:
1491
1491
            base = [None, None]
1492
 
            other = (branch, -1)
 
1492
            other = [branch, -1]
1493
1493
        else:
1494
1494
            if len(revision) == 1:
1495
 
                other = (branch, revision[0])
1496
 
                base = (None, None)
 
1495
                other = [branch, revision[0]]
 
1496
                base = [None, None]
1497
1497
            else:
1498
1498
                assert len(revision) == 2
1499
1499
                if None in revision: