← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge_directive.py

  • Committer: Aaron Bentley
  • Date: 2008-03-07 18:21:28 UTC
  • mto: This revision was merged to the branch mainline in revision 3255.
  • Revision ID: aaron@aaronbentley.com-20080307182128-p63rszbhci9jah92
Fix bug in last revno handling

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge_directive.py
144
144
        """
145
145
        revno, revision_id = branch.last_revision_info()
146
146
        if self.revision_id == revision_id:
147
 
            revno = str(revno)
 
147
            revno = [revno]
148
148
        else:
149
149
            revno = branch.get_revision_id_to_revno_map().get(self.revision_id,
150
150
                ['merge'])