← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/bundle/read_bundle.py

  • Committer: John Arbash Meinel
  • Date: 2006-06-18 02:21:57 UTC
  • mfrom: (1787 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1794.
  • Revision ID: john@arbash-meinel.com-20060618022157-6e33aa9b67c25e4f
[merge] bzr.dev 1787

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/read_bundle.py
28
28
from bzrlib.inventory import (Inventory, InventoryEntry,
29
29
                              InventoryDirectory, InventoryFile,
30
30
                              InventoryLink)
31
 
from bzrlib.osutils import sha_file, sha_string, pathjoin
 
31
from bzrlib.osutils import sha_file, sha_string
32
32
from bzrlib.revision import Revision, NULL_REVISION
33
33
from bzrlib.testament import StrictTestament
34
34
from bzrlib.trace import mutter, warning
718
718
            if old_dir is None:
719
719
                old_path = None
720
720
            else:
721
 
                old_path = pathjoin(old_dir, basename)
 
721
                old_path = os.path.join(old_dir, basename)
722
722
        else:
723
723
            old_path = new_path
724
724
        #If the new path wasn't in renamed, the old one shouldn't be in
743
743
            if new_dir is None:
744
744
                new_path = None
745
745
            else:
746
 
                new_path = pathjoin(new_dir, basename)
 
746
                new_path = os.path.join(new_dir, basename)
747
747
        else:
748
748
            new_path = old_path
749
749
        #If the old path wasn't in renamed, the new one shouldn't be in