← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/branch_implementations/test_reconcile.py

  • Committer: Robert J. Tanner
  • Date: 2009-06-10 03:56:49 UTC
  • mfrom: (4423 +trunk)
  • mto: This revision was merged to the branch mainline in revision 4425.
  • Revision ID: tanner@real-time.com-20090610035649-7rfx4cls4550zc3c
Merge 1.15.1 back to trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/branch_implementations/test_reconcile.py
70
70
        a_branch = self.make_branch('a_branch')
71
71
        a_branch.reconcile(thorough=False)
72
72
        a_branch.reconcile(thorough=True)
 
73
 
 
74
    def test_reconcile_handles_ghosts_in_revhistory(self):
 
75
        tree = self.make_branch_and_tree('test')
 
76
        tree.set_parent_ids(["spooky"], allow_leftmost_as_ghost=True)
 
77
        r1 = tree.commit('one')
 
78
        r2 = tree.commit('two')
 
79
        tree.branch.set_last_revision_info(2, r2)
 
80
 
 
81
        reconciler = tree.branch.reconcile()
 
82
        self.assertEquals([r1, r2], tree.branch.revision_history())