| commit | 54d5cc0e126ed4b6cc4b186efd9faf7b93df570f | |
| author | Nick Woolley <nickwoolley@yahoo.co.uk> | |
| Thu, 28 May 2009 23:23:33 +0000 (29 00:23 +0100) | ||
| committer | Junio C Hamano <gitster@pobox.com> | |
| Fri, 29 May 2009 06:51:03 +0000 (28 23:51 -0700) | ||
| tree | f3ae07ac96daa048e6ae2bd65f7873431af9cf2d | treesnapshot (tar.gz zip) |
| parent | e57cb0158209ece040a4b873064504efd7d2ec0e | commitdiff |
git-cvsexportcommit can't commit files which have been removed from CVS
If a file X is removed from CVS, it goes into the Attic directory, and CVS
reports it as 'no file X' but with status 'Up-to-date'. cvsexportcommit
misinterprets this as an existing file and tries to commit a file with the
same name. Correctly identify these files, so that new files with the
same name can be committed.
Add a test to t9200-git-cvsexportcommit.sh, which tests that we can
re-commit a removed filename which remains in CVS's attic. This adds a
file 'attic_gremlin' in CVS, then "removes" it, then tries to commit a
file with the same name from git.
Signed-off-by: Nick Woolley <git.wu-lee@noodlefactory.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
If a file X is removed from CVS, it goes into the Attic directory, and CVS
reports it as 'no file X' but with status 'Up-to-date'. cvsexportcommit
misinterprets this as an existing file and tries to commit a file with the
same name. Correctly identify these files, so that new files with the
same name can be committed.
Add a test to t9200-git-cvsexportcommit.sh, which tests that we can
re-commit a removed filename which remains in CVS's attic. This adds a
file 'attic_gremlin' in CVS, then "removes" it, then tries to commit a
file with the same name from git.
Signed-off-by: Nick Woolley <git.wu-lee@noodlefactory.co.uk>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
| git-cvsexportcommit.perl | diffblobblamehistory | |
| t/t9200-git-cvsexportcommit.sh | diffblobblamehistory |