[MERGE] integrated EOL conversion support

Alexander Belchenko bialix at ukr.net
Fri Mar 27 15:17:03 GMT 2009


Ian Clatworthy пишет:
> I'd greatly appreciate it if someone could apply this patch
> on Windows, run "./bzr selftest test_eol" and confirm all
> the tests pass there.

C:\work\Bazaar\mydev.packs\bzr-eol>python bzr --no-plugins selftest test_eol -v > test.log
tests passed


test.log content:

testing: C:/work/Bazaar/mydev.packs/bzr-eol/bzr
    C:\work\Bazaar\mydev.packs\bzr-eol\bzrlib (1.14dev python2.5.4)

running 18 tests...
test_eol_filters.TestEolFilters.test_to_crlf                                                         OK 
  19ms
test_eol_filters.TestEolFilters.test_to_lf                                                           OK 
   9ms
workingtree_implementations.test_eol_conversion.TestEolConversion.test_eol_dos(WorkingTreeFormat5)   OK 
5638ms
workingtree_implementations.test_eol_conversion.TestEolConversion.test_eol_dos(WorkingTreeFormat4) SKIP 
   0ms
format Bazaar Working Tree Format 4 (bzr 0.15)
  doesn't support content filtering
workingtree_implementations.test_eol_conversion.TestEolConversion.test_eol_dos(WorkingTreeFormat3) SKIP 
   0ms
format Bazaar-NG Working Tree format 3 doesn't support content filtering
workingtree_implementations.test_eol_conversion.TestEolConversion.test_eol_dos(WorkingTreeFormat2) SKIP 
   0ms
format <bzrlib.workingtree.WorkingTreeFormat2 object at 0x014D5190> doesn't support content filtering
...ngtree_implementations.test_eol_conversion.TestEolConversion.test_eol_exact(WorkingTreeFormat5)   OK 
3465ms
...ngtree_implementations.test_eol_conversion.TestEolConversion.test_eol_exact(WorkingTreeFormat4) SKIP 
   0ms
format Bazaar Working Tree Format 4 (bzr 0.15)
  doesn't support content filtering
...ngtree_implementations.test_eol_conversion.TestEolConversion.test_eol_exact(WorkingTreeFormat3) SKIP 
   0ms
format Bazaar-NG Working Tree format 3 doesn't support content filtering
...ngtree_implementations.test_eol_conversion.TestEolConversion.test_eol_exact(WorkingTreeFormat2) SKIP 
   0ms
format <bzrlib.workingtree.WorkingTreeFormat2 object at 0x014D5190> doesn't support content filtering
...ree_implementations.test_eol_conversion.TestEolConversion.test_eol_no_rules(WorkingTreeFormat5)   OK 
3444ms
...ree_implementations.test_eol_conversion.TestEolConversion.test_eol_no_rules(WorkingTreeFormat4) SKIP 
   0ms
format Bazaar Working Tree Format 4 (bzr 0.15)
  doesn't support content filtering
...ree_implementations.test_eol_conversion.TestEolConversion.test_eol_no_rules(WorkingTreeFormat3) SKIP 
   0ms
format Bazaar-NG Working Tree format 3 doesn't support content filtering
...ree_implementations.test_eol_conversion.TestEolConversion.test_eol_no_rules(WorkingTreeFormat2) SKIP 
   0ms
format <bzrlib.workingtree.WorkingTreeFormat2 object at 0x014D5190> doesn't support content filtering
...ingtree_implementations.test_eol_conversion.TestEolConversion.test_eol_unix(WorkingTreeFormat5)   OK 
3505ms
...ingtree_implementations.test_eol_conversion.TestEolConversion.test_eol_unix(WorkingTreeFormat4) SKIP 
   0ms
format Bazaar Working Tree Format 4 (bzr 0.15)
  doesn't support content filtering
...ingtree_implementations.test_eol_conversion.TestEolConversion.test_eol_unix(WorkingTreeFormat3) SKIP 
   0ms
format Bazaar-NG Working Tree format 3 doesn't support content filtering
...ingtree_implementations.test_eol_conversion.TestEolConversion.test_eol_unix(WorkingTreeFormat2) SKIP 
   0ms
format <bzrlib.workingtree.WorkingTreeFormat2 object at 0x014D5190> doesn't support content filtering

----------------------------------------------------------------------
Ran 18 tests in 16.654s

OK
12 tests skipped




More information about the bazaar mailing list