← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

[merge] win32

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
16
16
 
17
17
 
18
18
import os
19
 
import tempfile
20
19
import shutil
21
20
import errno
22
21
 
39
38
from bzrlib.trace import mutter, warning, note
40
39
from bzrlib.fetch import greedy_fetch, fetch
41
40
from bzrlib.revision import is_ancestor, NULL_REVISION
42
 
from bzrlib.osutils import rename
 
41
from bzrlib.osutils import rename, pathjoin
43
42
from bzrlib.revision import common_ancestor, MultipleRevisionSources
44
43
from bzrlib.errors import NoSuchRevision
45
44
 
202
201
            abspath = self.create_all_missing(entry.parent_id, tree)
203
202
        else:
204
203
            abspath = self.abs_this_path(entry.parent_id)
205
 
        entry_path = os.path.join(abspath, entry.name)
 
204
        entry_path = pathjoin(abspath, entry.name)
206
205
        if not os.path.isdir(entry_path):
207
206
            self.create(file_id, entry_path, tree)
208
207
        return entry_path
217
216
        self.conflict("Other branch modified locally deleted file %s" %
218
217
                      other_path)
219
218
        parent_dir = self.add_missing_parents(file_id, self.other_tree)
220
 
        stem = os.path.join(parent_dir, os.path.basename(other_path))
 
219
        stem = pathjoin(parent_dir, os.path.basename(other_path))
221
220
        self.create(file_id, stem+".OTHER", self.other_tree)
222
221
        self.create(file_id, stem+".BASE", self.base_tree)
223
222
 
586
585
            entry = old_entries[file_id]
587
586
            if entry.parent_id is None:
588
587
                return entry.name
589
 
            return os.path.join(id2path(entry.parent_id), entry.name)
 
588
            return pathjoin(id2path(entry.parent_id), entry.name)
590
589
            
591
590
        for file_id in old_entries:
592
591
            entry = old_entries[file_id]
613
612
                parent = None
614
613
            else:
615
614
                parent = by_path[os.path.dirname(path)]
616
 
            abspath = os.path.join(self.this_tree.basedir, path)
 
615
            abspath = pathjoin(self.this_tree.basedir, path)
617
616
            kind = bzrlib.osutils.file_kind(abspath)
618
617
            new_inventory[file_id] = (path, file_id, parent, kind)
619
618
            by_path[path] = file_id