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