Re: CVS Merge problem - will not merge in new code

[Derek R. Price]

John Mocyk wrote:

> I get this message when I am trying to update a branch (same message
> if from a static tag or branch) and it seems to occur with some of the
> new files.
> The branch is just a project that is being worked on and the statictag
> is a tag of what was released into production and is code at
> production level.
>
> eg.
>
>      cvs co -r branch1 cvs server: file
>      pin60/setup/scripts/service_um.pod exists, but has been
>      added in revision production
>      cvs update -j production -Pd cvs server: file
>      pin60/setup/scripts/service_um.pod
>
>              cvs server: file pin60/setup/scripts/service_um.pod
>      exists, but has been added in revision production
>
>      This will occur on trying to merge in the changes from
>      another branch as well.
>      The file was created between the creation of branch1 and
>      statictag.
>
>
> What happen's is that any changes that I want bring in will not update
> the code on the branch.

If I understand your problem correctly, then that is intentional.  CVS
sees new files on each branch and has no idea how to procedd with the
merge.  It is expecting you to look at both versions and decide which is
the keeper or merge them youself.

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:address@hidden     OpenAvenue ( http://OpenAvenue.com )
--
I heard a lot of stories in my time.  They went along with the sound of the
tinny piano playing in the parlor downstairs.

                - Humphrey Bogart as Rick, _Casablanca_