RE: CVS won't merge.

[Jimmy Rimmer]

There wasn't one.  Thanks for the response.

The reason for it was that the repository had been moved to a new location,
and so everything had a new and different time associated with it.  Some
files had no local changes; others had only local changes (i.e., CVS was
working properly).  For the ones that had both local and remote changes, I
was able to merge the two changes by doing

        cvs update -j <early revision> -j <later but not current revision>
<filename>

-------------------------------------------------------------------------
Jimmy Rimmer, address@hidden      http://mp3.com/Rimbo?edSig
-------------------------------------------------------------------------
"First they tell you you're wrong and they can prove it; then they
 tell you you're right but it isn't important; then they tell you it's
 important but they knew it all along."            (Charles Kettering)


> -----Original Message-----
> From: address@hidden [mailto:address@hidden
> Sent: Friday, September 14, 2001 11:56 AM
> To: Jimmy Rimmer
> Cc: address@hidden
> Subject: Re: CVS won't merge.
> 
> 
> Jimmy Rimmer writes:
> > 
> > The HEAD files on the repository contain changes that I've 
> not yet merged
> > into my files, but for some reason CVS seems to think that 
> the version of
> > the files I have are modified versions of the HEAD.
> 
> The first step is to figure out why CVS doesn't think that the
> repository files have changed.  One possibility is that you have a
> sticky tag or date associated with the files in your working directory
> -- do a ``cvs status'' on one of the files to see.  If so, 
> use ``update
> -A'' to remove the sticky tag/date. 
> 
> -Larry Jones
> 
> The real fun of living wisely is that you get to be smug 
> about it. -- Hobbes
>