← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/branchbuilder.py

  • Committer: Jelmer Vernooij
  • Date: 2010-12-20 11:57:14 UTC
  • mto: This revision was merged to the branch mainline in revision 5577.
  • Revision ID: jelmer@samba.org-20101220115714-2ru3hfappjweeg7q
Don't use no-plugins.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/branchbuilder.py
21
21
    commit,
22
22
    errors,
23
23
    memorytree,
 
24
    revision,
24
25
    )
25
26
 
26
27
 
186
187
        :return: The revision_id of the new commit
187
188
        """
188
189
        if parent_ids is not None:
189
 
            base_id = parent_ids[0]
 
190
            if len(parent_ids) == 0:
 
191
                base_id = revision.NULL_REVISION
 
192
            else:
 
193
                base_id = parent_ids[0]
190
194
            if base_id != self._branch.last_revision():
191
195
                self._move_branch_pointer(base_id,
192
196
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)