/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/git/tests/test_blackbox.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2020-01-12 14:46:56 UTC
  • mfrom: (7404.5.6 follow-tree-references-branch)
  • Revision ID: breezy.the.bot@gmail.com-20200112144656-vx5jxg1votqi5217
Support checking out nested trees in "bzr branch", including for git repositories.

Merged from https://code.launchpad.net/~jelmer/brz/follow-tree-references-branch/+merge/374397

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/git/tests/test_blackbox.py
476
476
            with basis_tree.lock_read():
477
477
                self.assertEqual([], list(tree.iter_changes(basis_tree)))
478
478
 
 
479
    def test_branch_with_nested_trees(self):
 
480
        orig = self.make_branch_and_tree('source', format='git')
 
481
        subtree = self.make_branch_and_tree('source/subtree', format='git')
 
482
        self.build_tree(['source/subtree/a'])
 
483
        self.build_tree_contents([('source/.gitmodules', """\
 
484
[submodule "subtree"]
 
485
    path = subtree
 
486
    url = %s
 
487
""" % subtree.user_url)])
 
488
        subtree.add(['a'])
 
489
        subtree.commit('add subtree contents')
 
490
        orig.add_reference(subtree)
 
491
        orig.add(['.gitmodules'])
 
492
        orig.commit('add subtree')
 
493
 
 
494
        self.run_bzr('branch source target')
 
495
 
 
496
        target = WorkingTree.open('target')
 
497
        target_subtree = WorkingTree.open('target/subtree')
 
498
        self.assertTreesEqual(orig, target)
 
499
        self.assertTreesEqual(subtree, target_subtree)
 
500
 
479
501
 
480
502
class SwitchScriptTests(TestCaseWithTransportAndScript):
481
503