/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 breezy/tests/per_workingtree/test_commit.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2018-05-04 15:41:16 UTC
  • mfrom: (6926.2.17 tree-reference-fixes)
  • Revision ID: breezy.the.bot@gmail.com-20180504154116-wcevgfi1gl5nfbdc
Several changes to help foreign branch use of tree references.

Merged from https://code.launchpad.net/~jelmer/brz/tree-reference-fixes/+merge/342059

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_commit.py
374
374
            return
375
375
        subtree = self.make_branch_and_tree('subtree')
376
376
        subsubtree = self.make_branch_and_tree('subtree/subtree')
 
377
        subsub_revid = subsubtree.commit('subsubtree')
 
378
        subtree.commit('subtree')
377
379
        subtree.add(['subtree'])
378
380
        tree.add(['subtree'])
379
381
        # use allow_pointless=False to ensure that the deepest tree, which
382
384
        tree.lock_read()
383
385
        self.addCleanup(tree.unlock)
384
386
        # the deepest subtree has not changed, so no commit should take place.
385
 
        self.assertEqual('null:', subsubtree.last_revision())
 
387
        self.assertEqual(subsub_revid, subsubtree.last_revision())
386
388
        # the intermediate tree should have committed a pointer to the current
387
389
        # subtree revision.
388
390
        sub_basis = subtree.basis_tree()
443
445
            # inapplicable test.
444
446
            return
445
447
        subtree = self.make_branch_and_tree('subtree')
 
448
        subtree.commit('')
446
449
        tree.add(['subtree'])
447
450
        # record the reference.
448
451
        rev_id = tree.commit('added reference')