# APC - test rdiff_reset_ts patch # rdiff should reset the patch timestamp to 0 for removed files mkdir testimport cd testimport echo "removeme" > removeme echo "completely" >> removeme dotest_sort rdiff-9.0-reset_ts-do_import \ "${testcvs} import -I ! -m reset-ts-import trdiff_reset_ts TRDIFF T9" \ '
N trdiff_reset_ts/removeme No conflicts created by this import' dotest rdiff-9.1-reset_ts-do_checkout \ "${testcvs} co trdiff_reset_ts" \ "${PROG}"' [a-z]*: Updating trdiff_reset_ts U trdiff_reset_ts/removeme' cd trdiff_reset_ts dotest rdiff-9.3-reset_ts-do_remove \ "${testcvs} rm -f removeme" \ "${PROG}"' [a-z]*: scheduling `removeme'\'' for removal '"${PROG}"' [a-z]*: use .'"${PROG}"' commit. to remove this file permanently' dotest rdiff-9.4-reset_ts-do_commit \ "${testcvs} commit -m reset-ts-commit removeme" \ "Removing removeme; ${CVSROOT_DIRNAME}/trdiff_reset_ts/removeme,v <-- removeme new revision: delete; previous revision: 1\.1\.1\.1 done" dotest rdiff-9.5-reset_ts-do_rdiff \ "${testcvs} rdiff -u -r1\.1 trdiff_reset_ts" \ "${PROG}"' [a-z]*: Diffing trdiff_reset_ts Index: trdiff_reset_ts/removeme diff -u trdiff_reset_ts/removeme:1\.1 trdiff_reset_ts/removeme:removed --- trdiff_reset_ts/removeme:1\.1 .* +++ trdiff_reset_ts/removeme .* 19\(69\|70\) @@ -1,2 +0,0 @@ -removeme -completely' cd ../.. rm -r testimport rm -rf ${CVSROOT_DIRNAME}/trdiff_reset_ts # APC - test rdiff_skip_binary # rdiff should warn and skip binary files like patch does mkdir testimport cd testimport echo "not a real binary file" > fakebinary ${AWK} 'BEGIN { printf "%c%c%c@%c%c", 2, 10, 137, 13, 10 }' \ </dev/null | ${TR} '@' '\000' > realbinary echo "just a text file" > textfile dotest_sort rdiff-10.0-skip_binary-do_import \ "${testcvs} import -I ! -m skip-binary-import trdiff_skip_binary TRDIFF T10" \ ' N trdiff_skip_binary/fakebinary N trdiff_skip_binary/realbinary N trdiff_skip_binary/textfile No conflicts created by this import' dotest rdiff-10.1-skip_binary-do_checkout \ "${testcvs} co trdiff_skip_binary " \ "${PROG}"' [a-z]*: Updating trdiff_skip_binary U trdiff_skip_binary/fakebinary U trdiff_skip_binary/realbinary U trdiff_skip_binary/textfile' cd trdiff_skip_binary dotest rdiff-10.3-skip_binary-do_makebinary \ "${testcvs} admin -kb fakebinary realbinary" \ "RCS file: ${CVSROOT_DIRNAME}/trdiff_skip_binary/fakebinary,v done RCS file: ${CVSROOT_DIRNAME}/trdiff_skip_binary/realbinary,v done" dotest rdiff-10.4-skip_binary-do_update \ "${testcvs} update" \ "${PROG}"' [a-z]*: Updating \. U fakebinary U realbinary' cat realbinary realbinary > realbinary.new mv realbinary.new realbinary echo "more text" >> fakebinary echo "more text" >> textfile dotest rdiff-10.4-skip_binary-do_commit \ "${testcvs} commit -m skip-binary-commit" \ "${PROG}"' [a-z]*: Examining \. Checking in fakebinary; '"${CVSROOT_DIRNAME}"'/trdiff_skip_binary/fakebinary,v <-- fakebinary new revision: 1\.2; previous revision: 1\.1 done Checking in realbinary; '"${CVSROOT_DIRNAME}"'/trdiff_skip_binary/realbinary,v <-- realbinary new revision: 1\.2; previous revision: 1\.1 done Checking in textfile; '"${CVSROOT_DIRNAME}"'/trdiff_skip_binary/textfile,v <-- textfile new revision: 1\.2; previous revision: 1\.1 done' dotest rdiff-10.5-reset_ts-do_rdiff \ "${testcvs} rdiff -u -r1\.1 trdiff_skip_binary" \ "${PROG}"' [a-z]*: Diffing trdiff_skip_binary Binary files trdiff_skip_binary/fakebinary:1\.1 and trdiff_skip_binary/fakebinary:1\.2 differ Binary files trdiff_skip_binary/realbinary:1\.1 and trdiff_skip_binary/realbinary:1\.2 differ Index: trdiff_skip_binary/textfile diff -u trdiff_skip_binary/textfile:1\.1 trdiff_skip_binary/textfile:1\.2 --- trdiff_skip_binary/textfile:1\.1 .* +++ trdiff_skip_binary/textfile .* @@ -1 +1,2 @@ just a text file +more text' cd ../.. rm -r testimport rm -rf ${CVSROOT_DIRNAME}/trdiff_skip_binary _______________________________________________ Bug-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/bug-cvs