/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/bundle/bundle_data.py

  • Committer: Aaron Bentley
  • Date: 2006-06-21 13:37:30 UTC
  • mfrom: (1799 +trunk)
  • mto: This revision was merged to the branch mainline in revision 1802.
  • Revision ID: abentley@panoramicfeedback.com-20060621133730-6f6f965f4d2e3743
Merge bzr.dev

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/bundle/bundle_data.py
27
27
from bzrlib.inventory import (Inventory, InventoryEntry,
28
28
                              InventoryDirectory, InventoryFile,
29
29
                              InventoryLink)
30
 
from bzrlib.osutils import sha_file, sha_string
 
30
from bzrlib.osutils import sha_file, sha_string, pathjoin
31
31
from bzrlib.revision import Revision, NULL_REVISION
32
32
from bzrlib.testament import StrictTestament
33
33
from bzrlib.trace import mutter, warning
495
495
            if old_dir is None:
496
496
                old_path = None
497
497
            else:
498
 
                old_path = os.path.join(old_dir, basename)
 
498
                old_path = pathjoin(old_dir, basename)
499
499
        else:
500
500
            old_path = new_path
501
501
        #If the new path wasn't in renamed, the old one shouldn't be in
520
520
            if new_dir is None:
521
521
                new_path = None
522
522
            else:
523
 
                new_path = os.path.join(new_dir, basename)
 
523
                new_path = pathjoin(new_dir, basename)
524
524
        else:
525
525
            new_path = old_path
526
526
        #If the old path wasn't in renamed, the new one shouldn't be in