/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

Viewing changes to bzrlib/clean_tree.py

  • Committer: Vincent Ladeuil
  • Date: 2010-04-28 10:30:48 UTC
  • mto: (5190.1.1 integration)
  • mto: This revision was merged to the branch mainline in revision 5191.
  • Revision ID: v.ladeuil+lp@free.fr-20100428103048-hqg32oksuuunesj2
https://launchpad.net/bugs/401599
Fixed as per Andrew's review.

* bzrlib/tests/blackbox/test_push.py:
(TestPushStrictMixin.assertPushFails): Ensure that the error
message mentions --no-strict.
(TestPushStrictMixin.assertPushSucceeds): Rely on branches only to
satisfy dpush needs. Check the warning in the error message.

* bzrlib/tests/blackbox/test_dpush.py:
(TestDpushStrictMixin): Simplified now that the base class do less
assumptions.

Show diffs side-by-side

added added

removed removed

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