Re: Strange symptom with cvs status when merge between branches

[Derek R. Price]

Matthew Berney wrote:

> 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?

1)  IP3 is an alias for R2_0?
2)  Someone checked something into the R2_0 branch that had nothing to do with
you but happened to happen at a similar time?

Have you tried CVS log to see what exactly CVS wanted to patch into your R2_0?

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:address@hidden     OpenAvenue ( http://OpenAvenue.com )
--
Metaphors be with you.