← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-10-15 16:32:29 UTC
  • mfrom: (1731.1.67 unique-root)
  • Revision ID: pqm@pqm.ubuntu.com-20061015163229-648b1f2ebe692136
New trees have unique root ids

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
685
685
        # TODO: jam 20060426 we probably need a test in here in the
686
686
        #       case that the newly sprouted branch is a remote one
687
687
        if result_repo is None or result_repo.make_working_trees():
688
 
            result.create_workingtree()
 
688
            wt = result.create_workingtree()
 
689
            if wt.inventory.root is None:
 
690
                try:
 
691
                    wt.set_root_id(self.open_workingtree.get_root_id())
 
692
                except errors.NoWorkingTree:
 
693
                    pass
689
694
        return result
690
695
 
691
696
 
1701
1706
                                                  entry_vf=w)
1702
1707
        for old_revision in previous_entries:
1703
1708
                # if this fails, its a ghost ?
1704
 
                assert old_revision in self.converted_revs 
 
1709
                assert old_revision in self.converted_revs, \
 
1710
                    "Revision {%s} not in converted_revs" % old_revision
1705
1711
        self.snapshot_ie(previous_entries, ie, w, rev_id)
1706
1712
        del ie.text_id
1707
1713
        assert getattr(ie, 'revision', None) is not None