← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/changeset.py

  • Committer: Robert Collins
  • Date: 2005-10-02 21:51:29 UTC
  • mfrom: (1396)
  • mto: This revision was merged to the branch mainline in revision 1397.
  • Revision ID: robertc@robertcollins.net-20051002215128-5686c7d24bf9bdb9
merge from martins newformat branch - brings in transport abstraction

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/changeset.py
19
19
import stat
20
20
from bzrlib.trace import mutter
21
21
from bzrlib.osutils import rename
 
22
import bzrlib
22
23
 
23
24
# XXX: mbp: I'm not totally convinced that we should handle conflicts
24
25
# as part of changeset application, rather than only in the merge
862
863
            continue
863
864
        new_path = os.path.join(dir, new_tree_path)
864
865
        old_path = changed_inventory.get(entry.id)
865
 
        if os.path.exists(new_path):
 
866
        if bzrlib.osutils.lexists(new_path):
866
867
            if conflict_handler.target_exists(entry, new_path, old_path) == \
867
868
                "skip":
868
869
                continue