← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/serializer/__init__.py

  • Committer: John Arbash Meinel
  • Date: 2007-07-13 02:23:34 UTC
  • mfrom: (2592 +trunk) (2612 +trunk)
  • mto: This revision was merged to the branch mainline in revision 2614.
  • Revision ID: john@arbash-meinel.com-20070713022334-qb6ewgo6v4251yd9
[merge] bzr.dev 2612

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/serializer/__init__.py
118
118
         applying the bundle.
119
119
    :param out: Output file.
120
120
    """
121
 
    if base_revision_id is NULL_REVISION:
122
 
        base_revision_id = None
123
121
    revision_ids = set(repository.get_ancestry(revision_id, topo_sorted=False))
124
122
    revision_ids.difference_update(repository.get_ancestry(base_revision_id,
125
123
                                   topo_sorted=False))