← 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-08-28 11:19:49 UTC
  • mto: This revision was merged to the branch mainline in revision 5418.
  • Revision ID: jelmer@samba.org-20100828111949-6ke9opiop2oomr4f
Move get_config to ControlDir.

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,
25
24
    )
26
25
 
27
26
 
187
186
        :return: The revision_id of the new commit
188
187
        """
189
188
        if parent_ids is not None:
190
 
            if len(parent_ids) == 0:
191
 
                base_id = revision.NULL_REVISION
192
 
            else:
193
 
                base_id = parent_ids[0]
 
189
            base_id = parent_ids[0]
194
190
            if base_id != self._branch.last_revision():
195
191
                self._move_branch_pointer(base_id,
196
192
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)