1
# Copyright (C) 2005-2011 Canonical Ltd
1
# Copyright (C) 2005-2011, 2016 Canonical Ltd
3
3
# This program is free software; you can redistribute it and/or modify
4
4
# it under the terms of the GNU General Public License as published by
67
67
tree2.commit("Commit four", rev_id="b@u-0-3")
68
68
tree2.commit("Commit five", rev_id="b@u-0-4")
69
revisions_2 = br2.revision_history()
70
self.assertEquals(revisions_2[-1], 'b@u-0-4')
69
self.assertEqual(br2.last_revision(), 'b@u-0-4')
72
71
tree1.merge_from_branch(br2)
73
72
tree1.commit("Commit six", rev_id="a@u-0-3")
74
73
tree1.commit("Commit seven", rev_id="a@u-0-4")
75
74
tree2.commit("Commit eight", rev_id="b@u-0-5")
76
self.assertEquals(br2.revision_history()[-1], 'b@u-0-5')
75
self.assertEqual(br2.last_revision(), 'b@u-0-5')
78
77
tree1.merge_from_branch(br2)
79
78
tree1.commit("Commit nine", rev_id="a@u-0-5")
80
79
# DO NOT MERGE HERE - we WANT a GHOST.
81
tree2.add_parent_tree_id(br1.revision_history()[4])
82
graph = br1.repository.get_graph()
83
revhistory = list(graph.iter_lefthand_ancestry(br1.last_revision(),
84
[revision.NULL_REVISION]))
88
tree2.add_parent_tree_id(revhistory[4])
82
89
tree2.commit("Commit ten - ghost merge", rev_id="b@u-0-6")