277
276
self.branch.get_transaction())
278
277
self.assertEqual(self.file_1.revision, '1')
279
278
self.assertEqual(self.file_active.revision, '1')
283
279
self.assertRaises(errors.RevisionNotPresent,
287
283
def test_snapshot_merge_identical_different_revid(self):
288
284
# This tests that a commit with two identical parents, one of which has