~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/tests/blackbox/test_mv.py

Committer: Marius Kruger
Date: 2006-12-21 19:14:35 UTC
mto: (2220.1.1 bzr.enhanced_move)
mto: This revision was merged to the branch mainline in revision 2241.
Revision ID: marius.kruger@enerweb.co.za-20061221191435-3y22jy8raa6959yk

* errors
  - Add AlreadyVersionedError
  - Fix type
  - Add 'extra' capability to PathsDoNotExist.
* update test_mv
* workingtre
  - Convert more BzrErrors to mores specialised ones.

files modified:
bzrlib/errors.py

bzrlib/tests/blackbox/test_mv.py

bzrlib/workingtree.py

Show diffs side-by-side

added added

removed removed

bzrlib/tests/blackbox/test_mv.py

171

172

os.remove('a')

173

self.run_bzr_error(

174

["^bzr: ERROR: can't rename: new name .* is already versioned$"],

174

["^bzr: ERROR: Invalid move destination: .* is already versioned$"],

175

'mv', 'a', 'b')

176

self.failIfExists('a')

177

self.failUnlessExists('b')

245

tree.commit('initial commit')

246

247

self.run_bzr_error(

248

["^bzr: ERROR: can't rename: both, old name .* and new name .*"

249

" exist. Use option '--after' to force rename."],

248

["^bzr: ERROR: File$s$ exist: .+ .+: can't rename."

249

" Use option '--after' to force rename."],

250

'mv', 'a', 'b')

251

self.failUnlessExists('a')

252

self.failUnlessExists('b')

273

tree.commit('initial commit')

274

275

self.run_bzr_error(

276

["^bzr: ERROR: can't rename: both, old name .* and new name .*"

277

" exist. Use option '--after' to force rename."],

276

["^bzr: ERROR: File$s$ exist: .+ .+: can't rename."

277

" Use option '--after' to force rename."],

278

'mv', 'a1', 'a2', 'sub1')

279

self.failUnlessExists('a1')

280

self.failUnlessExists('a2')

Older »