/brz/remove-bazaar

To get this branch, use:
bzr branch http://gegoxaren.bato24.eu/bzr/brz/remove-bazaar

« back to all changes in this revision

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

  • Committer: John Arbash Meinel
  • Date: 2007-12-04 18:11:51 UTC
  • mfrom: (3074 +trunk)
  • mto: This revision was merged to the branch mainline in revision 3075.
  • Revision ID: john@arbash-meinel.com-20071204181151-br85qwsgshso16q5
[merge] bzr.dev 3074

Show diffs side-by-side

added added

removed removed

Lines of Context:
390
390
        self.assertFalse(reconciler.aborted,
391
391
            "reconcile should not have aborted on an unbroken repository.")
392
392
 
 
393
 
 
394
class TestRepeatedReconcile(TestReconcile):
 
395
 
 
396
    def test_trivial_two_reconciles_no_error(self):
 
397
        tree = self.make_branch_and_tree('.')
 
398
        tree.commit('first post')
 
399
        tree.branch.repository.reconcile(thorough=True)
 
400
        tree.branch.repository.reconcile(thorough=True)