~bzr-pqm/bzr/bzr.dev

Viewing changes to bzrlib/tests/workingtree_implementations/test_commit.py

Committer: Robert Collins
Date: 2007-03-06 12:28:18 UTC
mto: (2321.1.1 integration)
mto: This revision was merged to the branch mainline in revision 2322.
Revision ID: robertc@robertcollins.net-20070306122818-xk0lc3l01ecl6vbc

Get merge_nested finally working: change nested tree iterators to take file_ids, and ensure the right branch is connected to in the merge logic. May not be suitable for shared repositories yet.

files modified:
bzrlib/branch.py

bzrlib/bzrdir.py

bzrlib/inventory.py

bzrlib/merge.py

bzrlib/revisiontree.py

bzrlib/tests/tree_implementations/test_tree.py

bzrlib/tests/workingtree_implementations/test_commit.py

bzrlib/tree.py

bzrlib/workingtree_4.py

Show diffs side-by-side

added added

removed removed

bzrlib/tests/workingtree_implementations/test_commit.py

234

sub_basis.lock_read()

235

self.addCleanup(sub_basis.unlock)

236

self.assertEqual(subsubtree.last_revision(),

237

sub_basis.get_reference_revision(

238

sub_basis.inventory[sub_basis.path2id('subtree')]))

237

sub_basis.get_reference_revision(basis.path2id('subtree')))

239

238

# the intermediate tree has changed, so should have had a commit

240

239

# take place.

241

240

self.assertNotEqual(None, subtree.last_revision())

245

244

basis.lock_read()

246

245

self.addCleanup(basis.unlock)

247

246

self.assertEqual(subtree.last_revision(),

248

basis.get_reference_revision(

249

basis.inventory[basis.path2id('subtree')]))

247

basis.get_reference_revision(basis.path2id('subtree')))

250

248

# the outer tree must have have changed too.

251

249

self.assertNotEqual(None, rev_id)

252

250

278

276