diff options
| author | Junio C Hamano <gitster@pobox.com> | 2009-06-13 12:47:47 -0700 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2009-06-13 12:47:47 -0700 |
| commit | 49c7e4643b27ff07463b1a8774fee25ef22a0d1c (patch) | |
| tree | 92d17857dc2f6057cfcf237c0c12be30539863d8 /t | |
| parent | 1bbc820414d94452d1417bb83db86309f34720a3 (diff) | |
| parent | 54d5cc0e126ed4b6cc4b186efd9faf7b93df570f (diff) | |
| download | git-49c7e4643b27ff07463b1a8774fee25ef22a0d1c.tar.gz git-49c7e4643b27ff07463b1a8774fee25ef22a0d1c.tar.xz | |
Merge branch 'nw/maint-cvsexportcommit'
* nw/maint-cvsexportcommit:
git-cvsexportcommit can't commit files which have been removed from CVS
Diffstat (limited to 't')
| -rwxr-xr-x | t/t9200-git-cvsexportcommit.sh | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/t/t9200-git-cvsexportcommit.sh b/t/t9200-git-cvsexportcommit.sh index 56b7c0692..ef1f8d22f 100755 --- a/t/t9200-git-cvsexportcommit.sh +++ b/t/t9200-git-cvsexportcommit.sh @@ -317,4 +317,22 @@ test_expect_success 'use the same checkout for Git and CVS' ' ' +test_expect_success '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" +' + test_done |