/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/branchbuilder.py

  • Committer: Gary van der Merwe
  • Date: 2010-11-17 13:28:29 UTC
  • mto: This revision was merged to the branch mainline in revision 5543.
  • Revision ID: garyvdm@gmail.com-20101117132829-650xk61klnoeihm9
https://launchpad.net/bugs/588698
Make merge correctly locate a lca where there is a criss-cross merge of a new root.

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
 
197
198
            tree = memorytree.MemoryTree.create_on_branch(self._branch)
198
199
        tree.lock_write()
199
200
        try:
200
 
            if parent_ids is not None:
 
201
            if parent_ids == [revision.NULL_REVISION]:
 
202
                tree.set_parent_ids([],
 
203
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
 
204
            elif parent_ids is not None:
201
205
                tree.set_parent_ids(parent_ids,
202
206
                    allow_leftmost_as_ghost=allow_leftmost_as_ghost)
203
207
            # Unfortunately, MemoryTree.add(directory) just creates an