Initialized empty Git repository in /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/.git/ expecting success: mkdir A B C D E F && echo hello1 >A/newfile1.txt && echo hello2 >B/newfile2.txt && cp "$TEST_DIRECTORY"/test9200a.png C/newfile3.png && cp "$TEST_DIRECTORY"/test9200a.png D/newfile4.png && git add A/newfile1.txt && git add B/newfile2.txt && git add C/newfile3.png && git add D/newfile4.png && git commit -a -m "Test: New file" && id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && git cvsexportcommit -c $id && check_entries A "newfile1.txt/1.1/" && check_entries B "newfile2.txt/1.1/" && check_entries C "newfile3.png/1.1/-kb" && check_entries D "newfile4.png/1.1/-kb" && test_cmp A/newfile1.txt ../A/newfile1.txt && test_cmp B/newfile2.txt ../B/newfile2.txt && test_cmp C/newfile3.png ../C/newfile3.png && test_cmp D/newfile4.png ../D/newfile4.png ) [master c83f9d3] Test: New file Author: A U Thor 4 files changed, 2 insertions(+), 0 deletions(-) create mode 100644 A/newfile1.txt create mode 100644 B/newfile2.txt create mode 100644 C/newfile3.png create mode 100644 D/newfile4.png Checking if patch will apply Applying Patch applied successfully. Adding new files and directories to CVS Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/D added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/C added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/B added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/A added to the repository cvs add: scheduling file `A/newfile1.txt' for addition cvs add: use `cvs commit' to add this file permanently cvs add: scheduling file `B/newfile2.txt' for addition cvs add: use `cvs commit' to add this file permanently cvs add: scheduling file `C/newfile3.png' for addition cvs add: use `cvs commit' to add this file permanently cvs add: scheduling file `D/newfile4.png' for addition cvs add: use `cvs commit' to add this file permanently Commit to CVS Patch title (first comment line): Test: New file Autocommit cvs commit -F .msg 'A/newfile1.txt' 'B/newfile2.txt' 'C/newfile3.png' 'D/newfile4.png' cvs [commit aborted]: 'root' is not allowed to commit files cvs commit -F .msg A/newfile1.txt B/newfile2.txt C/newfile3.png D/newfile4.png: 256 at /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/git-cvsexportcommit line 429. not ok - 1 New file # mkdir A B C D E F && # echo hello1 >A/newfile1.txt && # echo hello2 >B/newfile2.txt && # cp "$TEST_DIRECTORY"/test9200a.png C/newfile3.png && # cp "$TEST_DIRECTORY"/test9200a.png D/newfile4.png && # git add A/newfile1.txt && # git add B/newfile2.txt && # git add C/newfile3.png && # git add D/newfile4.png && # git commit -a -m "Test: New file" && # id=$(git rev-list --max-count=1 HEAD) && # (cd "$CVSWORK" && # git cvsexportcommit -c $id && # check_entries A "newfile1.txt/1.1/" && # check_entries B "newfile2.txt/1.1/" && # check_entries C "newfile3.png/1.1/-kb" && # check_entries D "newfile4.png/1.1/-kb" && # test_cmp A/newfile1.txt ../A/newfile1.txt && # test_cmp B/newfile2.txt ../B/newfile2.txt && # test_cmp C/newfile3.png ../C/newfile3.png && # test_cmp D/newfile4.png ../D/newfile4.png # ) expecting success: echo Hello1 >>A/newfile1.txt && rm -f B/newfile2.txt && rm -f C/newfile3.png && echo Hello5 >E/newfile5.txt && cp "$TEST_DIRECTORY"/test9200b.png D/newfile4.png && cp "$TEST_DIRECTORY"/test9200a.png F/newfile6.png && git add E/newfile5.txt && git add F/newfile6.png && git commit -a -m "Test: Remove, add and update" && id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && git cvsexportcommit -c $id && check_entries A "newfile1.txt/1.2/" && check_entries B "" && check_entries C "" && check_entries D "newfile4.png/1.2/-kb" && check_entries E "newfile5.txt/1.1/" && check_entries F "newfile6.png/1.1/-kb" && test_cmp A/newfile1.txt ../A/newfile1.txt && test_cmp D/newfile4.png ../D/newfile4.png && test_cmp E/newfile5.txt ../E/newfile5.txt && test_cmp F/newfile6.png ../F/newfile6.png ) [master 8bf50bf] Test: Remove, add and update Author: A U Thor 5 files changed, 5 insertions(+), 26 deletions(-) delete mode 100644 B/newfile2.txt rewrite D/newfile4.png (99%) create mode 100644 E/newfile5.txt rename C/newfile3.png => F/newfile6.png (100%) Checking if patch will apply File A/newfile1.txt not up to date but has status 'Locally Added' in your CVS checkout! File B/newfile2.txt not up to date but has status 'Locally Added' in your CVS checkout! File C/newfile3.png not up to date but has status 'Locally Added' in your CVS checkout! File D/newfile4.png not up to date but has status 'Locally Added' in your CVS checkout! Exiting: your CVS tree is not clean for this merge. at /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/git-cvsexportcommit line 318. not ok - 2 Remove two files, add two and update two # echo Hello1 >>A/newfile1.txt && # rm -f B/newfile2.txt && # rm -f C/newfile3.png && # echo Hello5 >E/newfile5.txt && # cp "$TEST_DIRECTORY"/test9200b.png D/newfile4.png && # cp "$TEST_DIRECTORY"/test9200a.png F/newfile6.png && # git add E/newfile5.txt && # git add F/newfile6.png && # git commit -a -m "Test: Remove, add and update" && # id=$(git rev-list --max-count=1 HEAD) && # (cd "$CVSWORK" && # git cvsexportcommit -c $id && # check_entries A "newfile1.txt/1.2/" && # check_entries B "" && # check_entries C "" && # check_entries D "newfile4.png/1.2/-kb" && # check_entries E "newfile5.txt/1.1/" && # check_entries F "newfile6.png/1.1/-kb" && # test_cmp A/newfile1.txt ../A/newfile1.txt && # test_cmp D/newfile4.png ../D/newfile4.png && # test_cmp E/newfile5.txt ../E/newfile5.txt && # test_cmp F/newfile6.png ../F/newfile6.png # ) expecting success: cat F/newfile6.png >>D/newfile4.png && git commit -a -m "generatiion 1" && cat F/newfile6.png >>D/newfile4.png && git commit -a -m "generation 2" && id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && test_must_fail git cvsexportcommit -c $id ) [master 387228b] generatiion 1 Author: A U Thor 1 files changed, 0 insertions(+), 0 deletions(-) [master 18fd9bc] generation 2 Author: A U Thor 1 files changed, 0 insertions(+), 0 deletions(-) Checking if patch will apply File D/newfile4.png not up to date but has status 'Locally Added' in your CVS checkout! Exiting: your CVS tree is not clean for this merge. at /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/git-cvsexportcommit line 318. ok 3 - Fail to change binary more than one generation old expecting success: git reset --hard HEAD^^ && rm -f D/newfile4.png && git commit -a -m "test: remove only a binary file" && id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && git cvsexportcommit -c $id && check_entries A "newfile1.txt/1.2/" && check_entries B "" && check_entries C "" && check_entries D "" && check_entries E "newfile5.txt/1.1/" && check_entries F "newfile6.png/1.1/-kb" && test_cmp A/newfile1.txt ../A/newfile1.txt && test_cmp E/newfile5.txt ../E/newfile5.txt && test_cmp F/newfile6.png ../F/newfile6.png ) HEAD is now at 8bf50bf Test: Remove, add and update [master 1b10e89] test: remove only a binary file Author: A U Thor 1 files changed, 0 insertions(+), 0 deletions(-) delete mode 100644 D/newfile4.png Checking if patch will apply File D/newfile4.png not up to date but has status 'Locally Added' in your CVS checkout! Exiting: your CVS tree is not clean for this merge. at /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/git-cvsexportcommit line 318. not ok - 4 Remove only binary files # git reset --hard HEAD^^ && # rm -f D/newfile4.png && # git commit -a -m "test: remove only a binary file" && # id=$(git rev-list --max-count=1 HEAD) && # (cd "$CVSWORK" && # git cvsexportcommit -c $id && # check_entries A "newfile1.txt/1.2/" && # check_entries B "" && # check_entries C "" && # check_entries D "" && # check_entries E "newfile5.txt/1.1/" && # check_entries F "newfile6.png/1.1/-kb" && # test_cmp A/newfile1.txt ../A/newfile1.txt && # test_cmp E/newfile5.txt ../E/newfile5.txt && # test_cmp F/newfile6.png ../F/newfile6.png # ) expecting success: rm -f A/newfile1.txt && git commit -a -m "test: remove only a binary file" && id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && git cvsexportcommit -c $id && check_entries A "" && check_entries B "" && check_entries C "" && check_entries D "" && check_entries E "newfile5.txt/1.1/" && check_entries F "newfile6.png/1.1/-kb" && test_cmp E/newfile5.txt ../E/newfile5.txt && test_cmp F/newfile6.png ../F/newfile6.png ) [master 900ee35] test: remove only a binary file Author: A U Thor 1 files changed, 0 insertions(+), 2 deletions(-) delete mode 100644 A/newfile1.txt Checking if patch will apply File A/newfile1.txt not up to date but has status 'Locally Added' in your CVS checkout! Exiting: your CVS tree is not clean for this merge. at /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/git-cvsexportcommit line 318. not ok - 5 Remove only a text file # rm -f A/newfile1.txt && # git commit -a -m "test: remove only a binary file" && # id=$(git rev-list --max-count=1 HEAD) && # (cd "$CVSWORK" && # git cvsexportcommit -c $id && # check_entries A "" && # check_entries B "" && # check_entries C "" && # check_entries D "" && # check_entries E "newfile5.txt/1.1/" && # check_entries F "newfile6.png/1.1/-kb" && # test_cmp E/newfile5.txt ../E/newfile5.txt && # test_cmp F/newfile6.png ../F/newfile6.png # ) expecting success: mkdir "G g" && echo ok then >"G g/with spaces.txt" && git add "G g/with spaces.txt" && \ cp "$TEST_DIRECTORY"/test9200a.png "G g/with spaces.png" && \ git add "G g/with spaces.png" && git commit -a -m "With spaces" && id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && git cvsexportcommit -c $id && check_entries "G g" "with spaces.png/1.1/-kb|with spaces.txt/1.1/" ) [master 1434ecb] With spaces Author: A U Thor 2 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 G g/with spaces.png create mode 100644 G g/with spaces.txt Checking if patch will apply Applying Patch applied successfully. Adding new files and directories to CVS Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/G g added to the repository cvs add: scheduling file `G g/with spaces.png' for addition cvs add: use `cvs commit' to add this file permanently cvs add: scheduling file `G g/with spaces.txt' for addition cvs add: use `cvs commit' to add this file permanently Commit to CVS Patch title (first comment line): With spaces Autocommit cvs commit -F .msg G g/with spaces.png G g/with spaces.txt cvs [commit aborted]: 'root' is not allowed to commit files cvs commit -F .msg G g/with spaces.png G g/with spaces.txt: 256 at /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/git-cvsexportcommit line 429. not ok - 6 New file with spaces in file name # mkdir "G g" && # echo ok then >"G g/with spaces.txt" && # git add "G g/with spaces.txt" && \ # cp "$TEST_DIRECTORY"/test9200a.png "G g/with spaces.png" && \ # git add "G g/with spaces.png" && # git commit -a -m "With spaces" && # id=$(git rev-list --max-count=1 HEAD) && # (cd "$CVSWORK" && # git cvsexportcommit -c $id && # check_entries "G g" "with spaces.png/1.1/-kb|with spaces.txt/1.1/" # ) expecting success: echo Ok then >>"G g/with spaces.txt" && cat "$TEST_DIRECTORY"/test9200a.png >>"G g/with spaces.png" && \ git add "G g/with spaces.png" && git commit -a -m "Update with spaces" && id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && git cvsexportcommit -c $id check_entries "G g" "with spaces.png/1.2/-kb|with spaces.txt/1.2/" ) [master 63bab00] Update with spaces Author: A U Thor 2 files changed, 1 insertions(+), 0 deletions(-) Checking if patch will apply File G g/with spaces.png not up to date but has status 'Locally Added' in your CVS checkout! File G g/with spaces.txt not up to date but has status 'Locally Added' in your CVS checkout! Exiting: your CVS tree is not clean for this merge. at /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/git-cvsexportcommit line 318. --- expected 2011-01-07 07:14:40.223561409 +0000 +++ actual 2011-01-07 07:14:40.215561550 +0000 @@ -1,2 +1,2 @@ -with spaces.png/1.2/-kb -with spaces.txt/1.2/ +with spaces.png/0/-kb +with spaces.txt/0/ not ok - 7 Update file with spaces in file name # echo Ok then >>"G g/with spaces.txt" && # cat "$TEST_DIRECTORY"/test9200a.png >>"G g/with spaces.png" && \ # git add "G g/with spaces.png" && # git commit -a -m "Update with spaces" && # id=$(git rev-list --max-count=1 HEAD) && # (cd "$CVSWORK" && # git cvsexportcommit -c $id # check_entries "G g" "with spaces.png/1.2/-kb|with spaces.txt/1.2/" # ) expecting success: mkdir -p Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö && echo Foo >Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt && git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt && cp "$TEST_DIRECTORY"/test9200a.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png && git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png && git commit -a -m "Går det så går det" && \ id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && git cvsexportcommit -v -c $id && check_entries \ "Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö" \ "gårdetsågårdet.png/1.1/-kb|gårdetsågårdet.txt/1.1/" ) [master 029c504] Går det så går det Author: A U Thor 2 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 "\303\205/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/\303\245/\303\244/\303\266/g\303\245rdets\303\245g\303\245rdet.png" create mode 100644 "\303\205/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/\303\245/\303\244/\303\266/g\303\245rdets\303\245g\303\245rdet.txt" Applying to CVS commit 029c5049bc30fd83424cb1907778352c90c7785a from parent 63bab0018f678b380fc1fbfcf37cea90ba7135d5 Checking if patch will apply Applying Patch applied successfully. Adding new files and directories to CVS Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä added to the repository Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö added to the repository cvs add: scheduling file `Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png' for addition cvs add: use `cvs commit' to add this file permanently cvs add: scheduling file `Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt' for addition cvs add: use `cvs commit' to add this file permanently Commit to CVS Patch title (first comment line): Går det så går det Autocommit cvs commit -F .msg 'Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png' 'Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt' cvs [commit aborted]: 'root' is not allowed to commit files cvs commit -F .msg Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt: 256 at /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/git-cvsexportcommit line 429. not ok - 8 File with non-ascii file name # mkdir -p Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö && # echo Foo >Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt && # git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.txt && # cp "$TEST_DIRECTORY"/test9200a.png Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png && # git add Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö/gårdetsågårdet.png && # git commit -a -m "Går det så går det" && \ # id=$(git rev-list --max-count=1 HEAD) && # (cd "$CVSWORK" && # git cvsexportcommit -v -c $id && # check_entries \ # "Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö" \ # "gårdetsågårdet.png/1.1/-kb|gårdetsågårdet.txt/1.1/" # ) expecting success: date >>"E/newfile5.txt" && git add "E/newfile5.txt" && git commit -a -m "Update one" && date >>"E/newfile5.txt" && git add "E/newfile5.txt" && git commit -a -m "Update two" && id=$(git rev-list --max-count=1 HEAD) && (cd "$CVSWORK" && test_must_fail git cvsexportcommit -c $id ) [master c2be698] Update one Author: A U Thor 1 files changed, 1 insertions(+), 0 deletions(-) [master 8313d93] Update two Author: A U Thor 1 files changed, 1 insertions(+), 0 deletions(-) Checking if patch will apply cvs [status aborted]: no such directory `E' cvs status E/newfile5.txt: 256 at /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/git-cvsexportcommit line 429. ok 9 - Mismatching patch should fail expecting success: mkdir G && echo executeon >G/on && chmod +x G/on && echo executeoff >G/off && git add G/on && git add G/off && git commit -a -m "Execute test" && (cd "$CVSWORK" && git cvsexportcommit -c HEAD test -x G/on && ! test -x G/off ) [master 52a67fb] Execute test Author: A U Thor 2 files changed, 2 insertions(+), 0 deletions(-) create mode 100644 G/off create mode 100755 G/on Checking if patch will apply Applying Patch applied successfully. Adding new files and directories to CVS Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/G added to the repository cvs add: scheduling file `G/off' for addition cvs add: use `cvs commit' to add this file permanently cvs add: scheduling file `G/on' for addition cvs add: use `cvs commit' to add this file permanently Commit to CVS Patch title (first comment line): Execute test Autocommit cvs commit -F .msg 'G/off' 'G/on' cvs [commit aborted]: 'root' is not allowed to commit files cvs commit -F .msg G/off G/on: 256 at /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/git-cvsexportcommit line 429. ok 10 - Retain execute bit expecting success: mkdir W && echo foobar >W/file1.txt && echo bazzle >W/file2.txt && git add W/file1.txt && git add W/file2.txt && git commit -m "More updates" && id=$(git rev-list --max-count=1 HEAD) && (cd "$GIT_DIR" && GIT_DIR=. git cvsexportcommit -w "$CVSWORK" -c $id && check_entries "$CVSWORK/W" "file1.txt/1.1/|file2.txt/1.1/" && test_cmp "$CVSWORK/W/file1.txt" ../W/file1.txt && test_cmp "$CVSWORK/W/file2.txt" ../W/file2.txt ) [master 5a53640] More updates Author: A U Thor 2 files changed, 2 insertions(+), 0 deletions(-) create mode 100644 W/file1.txt create mode 100644 W/file2.txt Checking if patch will apply Applying Patch applied successfully. Adding new files and directories to CVS Directory /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/cvsroot/W added to the repository cvs add: scheduling file `W/file1.txt' for addition cvs add: use `cvs commit' to add this file permanently cvs add: scheduling file `W/file2.txt' for addition cvs add: use `cvs commit' to add this file permanently Commit to CVS Patch title (first comment line): More updates Autocommit cvs commit -F .msg 'W/file1.txt' 'W/file2.txt' cvs [commit aborted]: 'root' is not allowed to commit files cvs commit -F .msg W/file1.txt W/file2.txt: 256 at /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/git-cvsexportcommit line 429. not ok - 11 -w option should work with relative GIT_DIR # # mkdir W && # echo foobar >W/file1.txt && # echo bazzle >W/file2.txt && # git add W/file1.txt && # git add W/file2.txt && # git commit -m "More updates" && # id=$(git rev-list --max-count=1 HEAD) && # (cd "$GIT_DIR" && # GIT_DIR=. git cvsexportcommit -w "$CVSWORK" -c $id && # check_entries "$CVSWORK/W" "file1.txt/1.1/|file2.txt/1.1/" && # test_cmp "$CVSWORK/W/file1.txt" ../W/file1.txt && # test_cmp "$CVSWORK/W/file2.txt" ../W/file2.txt # ) # expecting success: echo Notes > release-notes && git add release-notes && git commit -m "Add release notes" release-notes && id=$(git rev-parse HEAD) && git cvsexportcommit -w "$CVSWORK" -c $id && echo new > DS && echo new > E/DS && echo modified > release-notes && git add DS E/DS release-notes && git commit -m "Add two files with the same basename" && id=$(git rev-parse HEAD) && git cvsexportcommit -w "$CVSWORK" -c $id && check_entries "$CVSWORK/E" "DS/1.1/|newfile5.txt/1.1/" && check_entries "$CVSWORK" "DS/1.1/|release-notes/1.2/" && test_cmp "$CVSWORK/DS" DS && test_cmp "$CVSWORK/E/DS" E/DS && test_cmp "$CVSWORK/release-notes" release-notes [master 84c930b] Add release notes Author: A U Thor 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 release-notes Checking if patch will apply cvs status: nothing known about `release-notes' Applying Patch applied successfully. Adding new files and directories to CVS cvs add: scheduling file `release-notes' for addition cvs add: use `cvs commit' to add this file permanently Commit to CVS Patch title (first comment line): Add release notes Autocommit cvs commit -F .msg 'release-notes' cvs [commit aborted]: 'root' is not allowed to commit files cvs commit -F .msg release-notes: 256 at /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/git-cvsexportcommit line 429. not ok - 12 check files before directories # # # echo Notes > release-notes && # git add release-notes && # git commit -m "Add release notes" release-notes && # id=$(git rev-parse HEAD) && # git cvsexportcommit -w "$CVSWORK" -c $id && # # echo new > DS && # echo new > E/DS && # echo modified > release-notes && # git add DS E/DS release-notes && # git commit -m "Add two files with the same basename" && # id=$(git rev-parse HEAD) && # git cvsexportcommit -w "$CVSWORK" -c $id && # check_entries "$CVSWORK/E" "DS/1.1/|newfile5.txt/1.1/" && # check_entries "$CVSWORK" "DS/1.1/|release-notes/1.2/" && # test_cmp "$CVSWORK/DS" DS && # test_cmp "$CVSWORK/E/DS" E/DS && # test_cmp "$CVSWORK/release-notes" release-notes # # expecting success: (cd "$CVSWORK" && echo >attic_gremlin && cvs -Q add attic_gremlin && cvs -Q ci -m "added attic_gremlin" && rm attic_gremlin && cvs -Q rm attic_gremlin && cvs -Q ci -m "removed attic_gremlin") && echo > attic_gremlin && git add attic_gremlin && git commit -m "Added attic_gremlin" && git cvsexportcommit -w "$CVSWORK" -c HEAD && (cd "$CVSWORK"; cvs -Q update -d) && test -f "$CVSWORK/attic_gremlin" cvs [commit aborted]: 'root' is not allowed to commit files not ok - 13 re-commit a removed filename which remains in CVS attic # # # (cd "$CVSWORK" && # echo >attic_gremlin && # cvs -Q add attic_gremlin && # cvs -Q ci -m "added attic_gremlin" && # rm attic_gremlin && # cvs -Q rm attic_gremlin && # cvs -Q ci -m "removed attic_gremlin") && # # echo > attic_gremlin && # git add attic_gremlin && # git commit -m "Added attic_gremlin" && # git cvsexportcommit -w "$CVSWORK" -c HEAD && # (cd "$CVSWORK"; cvs -Q update -d) && # test -f "$CVSWORK/attic_gremlin" # expecting success: echo space > " space" && git add " space" && git commit -m "Add a file with a leading space" && id=$(git rev-parse HEAD) && git cvsexportcommit -w "$CVSWORK" -c $id && check_entries "$CVSWORK" " space/1.1/|DS/1.1/|attic_gremlin/1.3/|release-notes/1.2/" && test_cmp "$CVSWORK/ space" " space" [master 59deabc] Add a file with a leading space Author: A U Thor 1 files changed, 1 insertions(+), 0 deletions(-) create mode 100644 space Checking if patch will apply cvs status: nothing known about ` space' Applying Patch applied successfully. Adding new files and directories to CVS cvs add: scheduling file ` space' for addition cvs add: use `cvs commit' to add this file permanently Commit to CVS Patch title (first comment line): Add a file with a leading space Autocommit cvs commit -F .msg space cvs [commit aborted]: 'root' is not allowed to commit files cvs commit -F .msg space: 256 at /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/git-cvsexportcommit line 429. not ok - 14 commit a file with leading spaces in the name # # # echo space > " space" && # git add " space" && # git commit -m "Add a file with a leading space" && # id=$(git rev-parse HEAD) && # git cvsexportcommit -w "$CVSWORK" -c $id && # check_entries "$CVSWORK" " space/1.1/|DS/1.1/|attic_gremlin/1.3/|release-notes/1.2/" && # test_cmp "$CVSWORK/ space" " space" # # expecting success: (mkdir shared && cd shared && unset GIT_DIR && cvs co . && git init && git add " space" && git commit -m "fake initial commit" && echo Hello >> " space" && git commit -m "Another change" " space" && git cvsexportcommit -W -p -u -c HEAD && grep Hello " space" && git diff-files) cvs checkout: Updating . cvs checkout: Updating A cvs checkout: Updating B cvs checkout: Updating C cvs checkout: Updating CVSROOT U CVSROOT/checkoutlist U CVSROOT/commitinfo U CVSROOT/config U CVSROOT/cvswrappers U CVSROOT/loginfo U CVSROOT/modules U CVSROOT/notify U CVSROOT/postadmin U CVSROOT/postproxy U CVSROOT/posttag U CVSROOT/postwatch U CVSROOT/preproxy U CVSROOT/rcsinfo U CVSROOT/taginfo U CVSROOT/verifymsg cvs checkout: Updating D cvs checkout: Updating G cvs checkout: Updating G g cvs checkout: Updating W cvs checkout: Updating Å cvs checkout: Updating Å/goo cvs checkout: Updating Å/goo/a cvs checkout: Updating Å/goo/a/b cvs checkout: Updating Å/goo/a/b/c cvs checkout: Updating Å/goo/a/b/c/d cvs checkout: Updating Å/goo/a/b/c/d/e cvs checkout: Updating Å/goo/a/b/c/d/e/f cvs checkout: Updating Å/goo/a/b/c/d/e/f/g cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä cvs checkout: Updating Å/goo/a/b/c/d/e/f/g/h/i/j/k/l/m/n/o/p/q/r/s/t/u/v/w/x/y/z/å/ä/ö Initialized empty Git repository in /home/portage/dev-vcs/git-1.7.3.4-r1/work/git-1.7.3.4/t/trash directory.t9200-git-cvsexportcommit/shared/.git/ fatal: pathspec ' space' did not match any files not ok - 15 use the same checkout for Git and CVS # # # (mkdir shared && # cd shared && # unset GIT_DIR && # cvs co . && # git init && # git add " space" && # git commit -m "fake initial commit" && # echo Hello >> " space" && # git commit -m "Another change" " space" && # git cvsexportcommit -W -p -u -c HEAD && # grep Hello " space" && # git diff-files) # # # failed 12 among 15 test(s) 1..15