← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/builtins.py

  • Committer: Aaron Bentley
  • Date: 2005-10-17 15:23:49 UTC
  • mto: (1185.25.1)
  • mto: This revision was merged to the branch mainline in revision 1474.
  • Revision ID: abentley@panoramicfeedback.com-20051017152349-d8a9fdcf75898bd9
Fixed -r brokenness in merge

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/builtins.py
1261
1261
        else:
1262
1262
            if len(revision) == 1:
1263
1263
                base = [None, None]
1264
 
                other = [branch, revision[0].in_history(branch).revno]
 
1264
                other_branch = Branch.open_containing(branch)
 
1265
                revno = revision[0].in_history(other_branch).revno
 
1266
                other = [branch, revno]
1265
1267
            else:
1266
1268
                assert len(revision) == 2
1267
1269
                if None in revision:
1268
1270
                    raise BzrCommandError(
1269
1271
                        "Merge doesn't permit that revision specifier.")
1270
 
                b = Branch.open(branch)
 
1272
                b = Branch.open_containing(branch)
1271
1273
 
1272
1274
                base = [branch, revision[0].in_history(b).revno]
1273
1275
                other = [branch, revision[1].in_history(b).revno]