On 16 Apr 2008 09:48:29 -0700, Travis wrote:
>
> I work an environment w/ many branches checked out, etc. I added some
> files to one branch (successfully) and then a few weeks later, am
> trying to add the same files inside a different branch.
>
> Here is the error I receive (which I have never seen before).
>
> # cvs add file.png
> cvs add: file.png added independently by second party
>
Have you tried merging the files instead of adding them?
Let's assume you created the branch this way:
cvs rtag FIRST_BRANCH_ROOT project
cvs rtag -b first-branch project
cvs checkout -r first-branch -d project-first-branch project
cd project-first-branch
cvs tag BEFORE_ADDING_FIRST_BRANCH_FILES
[ ... add files, commit ... ]
cvs tag AFTER_ADDING_FIRST_BRANCH_FILES
[ ... create and checkout another branch, cd to that sandbox ... ]
cvs update -j BEFORE_ADDING_FIRST_BRANCH_FILES \
-j AFTER_ADDING_FIRST_BRANCH_FILES
Ted
--
dodecatheon at gmail dot com
Frango ut patefaciam -- I break so that I may reveal
