← Back to branch summary

~bzr-pqm/bzr/bzr.dev

« back to all changes in this revision

Viewing changes to bzrlib/tests/per_workingtree/test_merge_from_branch.py

  • Committer: Jelmer Vernooij
  • Date: 2011-08-04 13:30:30 UTC
  • mfrom: (6050 +trunk)
  • mto: This revision was merged to the branch mainline in revision 6052.
  • Revision ID: jelmer@samba.org-20110804133030-uwo00unp8b0n782c
merge bzr.dev.

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/per_workingtree/test_merge_from_branch.py
162
162
        outer.commit('added foo')
163
163
        inner = self.make_inner_branch()
164
164
        outer.merge_from_branch(inner, to_revision='1', from_revision='null:')
 
165
        #retain original root id.
 
166
        outer.set_root_id(outer.basis_tree().get_root_id())
165
167
        outer.commit('merge inner branch')
166
168
        outer.mkdir('dir-outer', 'dir-outer-id')
167
169
        outer.move(['dir', 'file3'], to_dir='dir-outer')