/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_merge_from_branch.py

  • Committer: Jelmer Vernooij
  • Date: 2019-08-11 13:21:03 UTC
  • mfrom: (7379 work)
  • mto: This revision was merged to the branch mainline in revision 7388.
  • Revision ID: jelmer@jelmer.uk-20190811132103-u3ne03yf37c1h57n
merge trunk.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/per_workingtree/test_merge_from_branch.py
166
166
            inner, to_revision=revs[0], from_revision=b'null:')
167
167
        # retain original root id.
168
168
        if outer.supports_setting_file_ids():
169
 
            outer.set_root_id(outer.basis_tree().get_root_id())
 
169
            outer.set_root_id(outer.basis_tree().path2id(''))
170
170
        outer.commit('merge inner branch')
171
171
        outer.mkdir('dir-outer')
172
172
        outer.move(['dir', 'file3'], to_dir='dir-outer')