← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

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

  • Committer: Andrew Bennetts
  • Date: 2009-07-27 05:35:00 UTC
  • mfrom: (4570 +trunk)
  • mto: (4634.6.29 2.0)
  • mto: This revision was merged to the branch mainline in revision 4680.
  • Revision ID: andrew.bennetts@canonical.com-20090727053500-q76zsn2dx33jhmj5
Merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_branch/test_reconcile.py
12
12
#
13
13
# You should have received a copy of the GNU General Public License
14
14
# along with this program; if not, write to the Free Software
15
 
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
15
# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
16
16
 
17
17
"""Tests for branch implementations - test reconcile() functionality"""
18
18
 
19
19
from bzrlib import errors, reconcile
20
 
from bzrlib.tests.branch_implementations import TestCaseWithBranch
 
20
from bzrlib.tests.per_branch import TestCaseWithBranch
21
21
 
22
22
 
23
23
class TestBranchReconcile(TestCaseWithBranch):
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())