~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/clean_tree.py

  • Committer: Parth Malwankar
  • Date: 2010-05-03 08:13:32 UTC
  • mfrom: (5199 +trunk)
  • mto: This revision was merged to the branch mainline in revision 5210.
  • Revision ID: parth.malwankar@gmail.com-20100503081332-sccscii0dqslaqu3
merged in changes from trunk and resolved conflict in NEWS.

Show diffs side-by-side

added added

removed removed

Lines of Context:
15
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
 
18
 
import errno
19
18
import os
20
19
import shutil
21
 
import sys
22
20
 
23
 
from bzrlib.osutils import has_symlinks, isdir
 
21
from bzrlib.osutils import isdir
24
22
from bzrlib.trace import note
25
23
from bzrlib.workingtree import WorkingTree
26
24