← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/conflicts.py

  • Committer: Aaron Bentley
  • Date: 2006-04-12 05:43:22 UTC
  • mto: This revision was merged to the branch mainline in revision 1655.
  • Revision ID: aaron.bentley@utoronto.ca-20060412054322-ba4676fe659f2707
Handle resolving conflicts with directories properly

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/conflicts.py
26
26
from bzrlib.commands import register_command
27
27
from bzrlib.errors import BzrCommandError, NotConflicted, UnsupportedOperation
28
28
from bzrlib.option import Option
29
 
from bzrlib.osutils import rename
 
29
from bzrlib.osutils import rename, delete_any
30
30
from bzrlib.rio import Stanza
31
31
 
32
32
 
190
190
                continue
191
191
            for suffix in CONFLICT_SUFFIXES:
192
192
                try:
193
 
                    os.unlink(tree.abspath(conflict.path+suffix))
 
193
                    delete_any(tree.abspath(conflict.path+suffix))
194
194
                except OSError, e:
195
195
                    if e.errno != errno.ENOENT:
196
196
                        raise