/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 bzrlib/tests/test_bundle.py

  • Committer: Martin Pool
  • Date: 2007-04-01 06:19:16 UTC
  • mfrom: (2323.5.20 0.15-integration)
  • mto: This revision was merged to the branch mainline in revision 2390.
  • Revision ID: mbp@sourcefrog.net-20070401061916-plpgsxdf8g7gll9o
Merge 0.15 final release back to trunk, including: recommend upgrades of old workingtrees, handle multiple http redirections, some dirstate fixes, 

Show diffs side-by-side

added added

removed removed

Lines of Context:
bzrlib/tests/test_bundle.py
764
764
        bundle_file = StringIO()
765
765
        rev_ids = write_bundle(self.tree1.branch.repository, 'a@cset-0-3',
766
766
                               'a@cset-0-1', bundle_file, format=self.format)
767
 
        self.assertNotContainsRe(bundle_file.getvalue(), '\btwo\b')
 
767
        self.assertNotContainsRe(bundle_file.getvalue(), 'two')
768
768
        self.assertContainsRe(bundle_file.getvalue(), 'one')
769
769
        self.assertContainsRe(bundle_file.getvalue(), 'three')
770
770
 
784
784
            u'William Dod\xe9\n').encode('utf-8'))
785
785
        f.close()
786
786
 
787
 
        self.tree1.add([u'with Dod\xe9'], ['withdod-id'])
788
 
        self.tree1.commit(u'i18n commit from William Dod\xe9',
 
787
        self.tree1.add([u'with Dod\xe9'])
 
788
        self.tree1.commit(u'i18n commit from William Dod\xe9', 
789
789
                          rev_id='i18n-1', committer=u'William Dod\xe9')
790
790
 
791
 
        if sys.platform == 'darwin':
792
 
            # On Mac the '\xe9' gets changed to 'e\u0301'
793
 
            self.assertEqual([u'.bzr', u'with Dode\u0301'],
794
 
                             sorted(os.listdir(u'b1')))
795
 
            delta = self.tree1.changes_from(self.tree1.basis_tree())
796
 
            self.assertEqual([(u'with Dod\xe9', 'withdod-id', 'file')],
797
 
                             delta.removed)
798
 
            self.knownFailure("Mac OSX doesn't preserve unicode"
799
 
                              " combining characters.")
800
 
 
801
791
        # Add
802
792
        bundle = self.get_valid_bundle(None, 'i18n-1')
803
793