/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/plugins/upload/tests/test_upload.py

  • Committer: Jelmer Vernooij
  • Date: 2018-06-18 02:13:57 UTC
  • mto: (6973.12.2 python3-k)
  • mto: This revision was merged to the branch mainline in revision 7004.
  • Revision ID: jelmer@jelmer.uk-20180618021357-xz802zqfmrf7zv1z
More test fixes.

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/plugins/upload/tests/test_upload.py
342
342
        self.run_bzr('branch branch other')
343
343
        self.modify_file('a', b'bar')
344
344
        other_tree = workingtree.WorkingTree.open('other')
345
 
        self.set_file_content('a', 'baz', b'other/')
 
345
        self.set_file_content('a', b'baz', 'other/')
346
346
        other_tree.commit('modify file a')
347
347
 
348
348
        self.run_bzr('merge -d branch other', retcode=1)