RE: Strange symptom with cvs status when merge between branches

[Matthew Berney]

The exact cvs commands in use are:

cvs up -r IP3  (update to the target branch)
cvs up -j Last_Merge_IP2 -j IP2  <file>  (merge changes since last merge)

As you can see, the R2_0 branch is not even included here.  And yes, we are
sure that the "Last_Merge_IP2" is on the IP2 branch and not the R2_0 branch.

Any clues?



-----Original Message-----
From: Derek R. Price [mailto:address@hidden
Sent: Friday, February 16, 2001 12:28 PM
To: Matthew Berney
Cc: 'address@hidden'; Fauzi Ashurex; John Raykowski
Subject: Re: Strange symptom with cvs status when merge between branches


Matthew Berney wrote:

> We are using a CVS pserver model with Linix Server and NT clients.  We are
> running CVS v1.10.8.
>
> We have three branches in the repository:  IP2, IP3, R2_0
>
> When we merge files between IP2 and IP3, then do a cvs status on R2_0,
then
> some of the files show up as "Needs Patch".  I am confused.  Why is the
R2_0
> branch effected by the merge operation when it wasn't even participating
in
> the merge?

What was the exact CVS command you used for the merge, and if you used 'cvs
up'
for the merge, are you certain you were merging to the branch you thought
you
were merging to?

Derek

--
Derek Price                      CVS Solutions Architect (
http://CVSHome.org )
mailto:address@hidden     OpenAvenue ( http://OpenAvenue.com )
--
The advertisement is the most truthful part of the paper.

                        - Thomas Jefferson