← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bzrdir.py

  • Committer: Aaron Bentley
  • Date: 2007-12-19 14:32:33 UTC
  • mto: This revision was merged to the branch mainline in revision 3135.
  • Revision ID: abentley@panoramicfeedback.com-20071219143233-ziv092s5phf2y41z
Restore old handling of set_root_id

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bzrdir.py
850
850
            wt.lock_write()
851
851
            try:
852
852
                if wt.path2id('') is None:
853
 
                    if self_wt is not None:
854
 
                        wt.set_root_id(self_wt.get_root_id())
 
853
                    try:
 
854
                        wt.set_root_id(self.open_workingtree.get_root_id())
 
855
                    except errors.NoWorkingTree:
 
856
                        pass
855
857
            finally:
856
858
                wt.unlock()
857
859
        else: