Я сообщаю о серии коммитов из git в cvs с помощью cvsexportcommit. Я обнаружил, что невозможно добавить файл VERSION в следующем контексте
| \_version/ | | | \_version.txt (to be removed) | \_VERSION (to be added)
Вывод, который я получаю, следующий:
Applying to CVS commit f6ce403e6e1d57b61661527969ac97c52bcbe41f from parent 076d1fb72d8498670582561b7318939bf209c1f4 Checking if patch will apply cvs status: Examining prometeo/VERSION Applying fatal: unable to write file prometeo/VERSION mode 100644 Patch applied successfully. Adding new files and directories to CVS cvs [add aborted]: there is a version in prometeo/VERSION already Failed to cvs add prometeo/VERSION -- you may need to do it manually at /usr/local/git/libexec/git-core/git-cvsexportcommit line 314. cvs remove: scheduling `prometeo/version/version.txt' for removal cvs remove: use 'cvs commit' to remove this file permanently Commit to CVS Patch title (first comment line): Moved tmtc-prometeo version number to prometeo/VERSION NOTE: One or more hunks failed to apply cleanly. You'll need to apply the patch in .cvsexportcommit.diff manually using a patch program. After applying the patch and resolving the problems you may commit using: cd "/Users/elia/Code/linux-tmtc/" cvs -d :ext:eschito@********:/cvshome/ground commit -F .msg 'prometeo/VERSION' 'prometeo/tool/bin/tmtc_info' 'prometeo/version/version.txt'
Если я попытаюсь вручную добавить файл "VERSION" в cvs, я получу:
> cvs add prometeo/VERSION
cvs [add aborted]: there is a version in prometeo/VERSION already
Любые идеи?