/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_intertree/test_compare.py

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2019-01-01 23:40:59 UTC
  • mfrom: (7206.6.8 move-reconcile)
  • Revision ID: breezy.the.bot@gmail.com-20190101234059-g2aoc3whzh3zkppv
Move bzr-specific reconcile bits to breezy.bzr.reconcile.

Merged from https://code.launchpad.net/~jelmer/brz/move-reconcile-1/+merge/359941

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_intertree/test_compare.py
798
798
        tree1.mkdir('changing', b'parent-id')
799
799
        tree1.mkdir('changing/unchanging', b'mid-id')
800
800
        tree1.add(['changing/unchanging/file'], [b'file-id'], ['file'])
801
 
        tree1.put_file_bytes_non_atomic('changing/unchanging/file', b'a file')
 
801
        tree1.put_file_bytes_non_atomic(
 
802
            'changing/unchanging/file', b'a file')
802
803
        tree2 = self.make_to_branch_and_tree('2')
803
804
        tree2.set_root_id(tree1.get_root_id())
804
805
        tree2.mkdir('changed', b'parent-id')
805
806
        tree2.mkdir('changed/unchanging', b'mid-id')
806
807
        tree2.add(['changed/unchanging/file'], [b'file-id'], ['file'])
807
 
        tree2.put_file_bytes_non_atomic('changed/unchanging/file', b'changed content')
 
808
        tree2.put_file_bytes_non_atomic(
 
809
            'changed/unchanging/file', b'changed content')
808
810
        tree1, tree2 = self.mutable_trees_to_test_trees(self, tree1, tree2)
809
811
        # parent-id has changed, as has file-id
810
812
        root_id = tree1.path2id('')