# 
# patch "ChangeLog"
#  from [ba9827bd1391cb01bf991307c0b3b7623fb1b43c]
#    to [683d5c57faf919307e31781f4f27ef9fdaf70fed]
# 
# patch "file_io.cc"
#  from [e78d02521cffd8f4d5c3d2f312d2f137d5674be9]
#    to [5554c12f8dc3935afe2f99fd83e57b515fb3d0cb]
# 
# patch "tests/t_lf_crlf.at"
#  from [e7fdfaf92b9f90899551f4a77a36487a1e7cf537]
#    to [7d5f60856e4d5fa739d66eb943995412016885b9]
# 
--- ChangeLog
+++ ChangeLog
@@ -1,3 +1,9 @@
+2005-04-19  Nathaniel Smith  <address@hidden>
+
+	* file_io.cc (read_localized_data, write_localized_data): Remove
+	logging of complete file contents.
+	* tests/t_lf_crlf.at: Remove --debugs, clean up, test more.
+
 2005-04-19 Emile Snyder <address@hidden>
 	
 	* file_io.cc: Fix bugs with read/write_localized_data when using
--- file_io.cc
+++ file_io.cc
@@ -463,7 +463,6 @@
     tmp1 = tmp2;
     charset_convert(ext_charset, db_charset, tmp1, tmp2);
   }
-  L(F("read_localized_data: from path '%s' got data\n%s\n") % path % tmp1);
   if (do_lineconv) {
     tmp1 = tmp2;
     line_end_convert(db_linesep, tmp1, tmp2);
@@ -549,7 +548,6 @@
   
   string tmp1, tmp2;
   tmp2 = dat();
-  L(F("write_localized_data: from path '%s' got data\n%s\n") % path % tmp2);
   if (do_lineconv) {
     tmp1 = tmp2;
     line_end_convert(ext_linesep, tmp1, tmp2);
--- tests/t_lf_crlf.at
+++ tests/t_lf_crlf.at
@@ -7,34 +7,43 @@
 
 AT_CHECK(printf "foo\r\n", [], [stdout])
 AT_CHECK(mv stdout foo.crlf)
+AT_CHECK(printf "foo\n", [], [stdout])
+AT_CHECK(mv stdout foo.lf)
 
 AT_CHECK(printf "foo\r\nfoo\r\n", [], [stdout])
 AT_CHECK(mv stdout foofoo.crlf)
+AT_CHECK(printf "foo\nfoo\n", [], [stdout])
+AT_CHECK(mv stdout foofoo.lf)
 
-AT_DATA(linesep.conv.lua, [
+AT_DATA(linesep.lua, [
 function get_linesep_conv(name)
         return {"LF", "CRLF"}
 end
 ])
 
-AT_DATA(linesep.null.lua, [])
-
-AT_CHECK(cp linesep.conv.lua linesep.lua)
-
 AT_CHECK(cp foo.crlf foo, [], [ignore], [ignore])
-AT_CHECK(MONOTONE --debug --rcfile=linesep.lua add foo, [], [], [stderr])
-AT_CHECK(mv stderr log.0)
-AT_CHECK(MONOTONE --debug --rcfile=linesep.lua --branch=foo commit -m foo, [], [ignore], [stderr])
-AT_CHECK(mv stderr log.1)
+AT_CHECK(MONOTONE --rcfile=linesep.lua add foo, [], [ignore], [ignore])
+AT_CHECK(MONOTONE --rcfile=linesep.lua --branch=foo commit -m foo, [], [ignore], [ignore])
 FOO_REV=`BASE_REVISION`
 
 AT_CHECK(cp foofoo.crlf foo, [], [ignore], [ignore])
-AT_CHECK(MONOTONE --debug --rcfile=linesep.lua commit -m foofoo, [], [ignore], [stderr])
-AT_CHECK(mv stderr log.2)
+AT_CHECK(MONOTONE --rcfile=linesep.lua commit -m foofoo, [], [ignore], [ignore])
 FOO_FOO_REV=`BASE_REVISION`
 
-AT_CHECK(MONOTONE --debug --rcfile=linesep.lua update $FOO_REV, [], [ignore], [stderr])
-AT_CHECK(mv stderr log.3)
+AT_CHECK(MONOTONE --rcfile=linesep.lua update $FOO_REV, [], [ignore], [ignore])
 AT_CHECK(cmp foo foo.crlf, [], [ignore], [ignore])
 
+AT_CHECK(MONOTONE --rcfile=linesep.lua checkout $FOO_REV foo_crlf, [], [ignore], [ignore])
+AT_CHECK(cmp foo.crlf foo_crlf/foo)
+
+AT_CHECK(MONOTONE --rcfile=linesep.lua checkout $FOO_FOO_REV foo_foo_crlf, [], [ignore], [ignore])
+AT_CHECK(cmp foofoo.crlf foo_foo_crlf/foo)
+
+# no rcfile here
+AT_CHECK(MONOTONE checkout $FOO_REV foo_lf, [], [ignore], [ignore])
+AT_CHECK(cmp foo.lf foo_lf/foo)
+
+AT_CHECK(MONOTONE checkout $FOO_FOO_REV foo_foo_lf, [], [ignore], [ignore])
+AT_CHECK(cmp foofoo.lf foo_foo_lf/foo)
+
 AT_CLEANUP