584
584
wtb.commit('changed file', allow_pointless=False)
585
585
wtb.merge_from_branch(wta.branch, wta.branch.last_revision(),
586
586
wta.branch.get_rev_id(1))
589
589
def test_merge_metadata_vs_deletion(self):
590
590
"""Conflict deletion vs metadata change"""