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

  • Committer: Breezy landing bot
  • Author(s): Jelmer Vernooij
  • Date: 2017-06-11 02:34:42 UTC
  • mfrom: (6681.2.10 more-controldir)
  • Revision ID: breezy.the.bot@gmail.com-20170611023442-p3vm7secrkqn6ckx
Some more bzrdir vs controldir fixes.

Merged from https://code.launchpad.net/~jelmer/brz/more-controldir/+merge/325453

Show diffs side-by-side

added added

removed removed

Lines of Context:
breezy/tests/test_diff.py
1489
1489
                                      'print "@old_path @new_path"'],
1490
1490
                                     old_tree, tree, output)
1491
1491
        self.addCleanup(diff_obj.finish)
1492
 
        self.assertContainsRe(diff_obj._root, 'bzr-diff-[^/]*')
 
1492
        self.assertContainsRe(diff_obj._root, 'brz-diff-[^/]*')
1493
1493
        old_path, new_path = diff_obj._prepare_files('file-id', 'oldname',
1494
1494
                                                     'newname')
1495
1495
        self.assertContainsRe(old_path, 'old/oldname$')