Re: Strange symptom with cvs status when merge between branches

[Derek R. Price]

Matthew Berney wrote:

> Thanks for the info Derek.
>
> Answer #1:  No IP3 and R2_0 are different branches in the repository
>
> Answer #2:  Timing may have something to do with it, but I doubt it.
> Nothing was happening on the R2_0 branch at the time of the merge.

If you find this is reproducible, by all means, send me a shell script to
duplicate the bug.


> If I do a cvs diff between the IP3 and R2_0 branch, there is no difference
> in the source (other than the revision, of course :)
>
> If I do a cvs update, nothing happens; i.e. there is nothing to update.
> But, the timestamp on the file changes to reflect the time the merge
> occurred...very strange.

This shouldn't (and I'm fairly certain doesn't) happen anyhow.  Update doesn't
sync timestamps, only checkout does that.  If update did, make would likely
get confused.  If update patches a file the file will get a mod time of when
the update occurred.

Did the revision change with the update?  If so, is it the same revision
number as IP3 got?  If not, can you look at the log message and see who
committed it?

Derek

--
Derek Price                      CVS Solutions Architect ( http://CVSHome.org )
mailto:address@hidden     OpenAvenue ( http://OpenAvenue.com )
--
I will not fake my way through life.
I will not fake my way through life.
I will not fake my way through life...

          - Bart Simpson on chalkboard, _The Simpsons_