← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/merge.py

  • Committer: Canonical.com Patch Queue Manager
  • Date: 2006-05-05 08:15:28 UTC
  • mfrom: (1692.7.8 bzr.mbp.integration)
  • Revision ID: pqm@pqm.ubuntu.com-20060505081528-8c0368b718fd7933
(mbp,alexander) rmtree forces deletion of readonly files on win32

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/merge.py
1
 
# Copyright (C) 2005 Canonical Ltd
 
1
# Copyright (C) 2005, 2006 Canonical Ltd
2
2
 
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
17
17
 
18
18
import os
19
19
import errno
20
 
from shutil import rmtree
21
20
from tempfile import mkdtemp
22
21
 
23
22
import bzrlib
39
38
                           )
40
39
from bzrlib.merge3 import Merge3
41
40
import bzrlib.osutils
42
 
from bzrlib.osutils import rename, pathjoin
 
41
from bzrlib.osutils import rename, pathjoin, rmtree
43
42
from progress import DummyProgress, ProgressPhase
44
43
from bzrlib.revision import common_ancestor, is_ancestor, NULL_REVISION
45
44
from bzrlib.symbol_versioning import *