bug-cvs
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: 1.11.6 Update broken


From: Paul Edwards
Subject: Re: 1.11.6 Update broken
Date: Mon, 30 Jun 2003 10:56:18 GMT

"Sabertooth" <address@hidden> wrote in message news:address@hidden
> Hi Paul,
>
> > When you say "completely overwrite my local copy with the
> > latest revision" do you mean:
> >
> > 1. your local changes are completely lost, or
> >
> > 2. your local file has your local changes plus the latest changes
> > all merged in together.

> Up until a few days ago, running 'cvs update' on a file that has been
> locally modified would put the character 'M' next to the file.  If
> there was a conflict, it would print a message indicating so and mark
> the offending code (something like ">>>>>>>>>>" and "<<<<<<<<<" around
> the old and new).
> Now, running the same command replaces the local file entirely with
> the latest tip.  The locally-modified file is renamed (to something
> like ".#Filename") and a message is printed indicating so.

It certainly sounds like you've got a problem.  Do you have the
old CVS executable available?  You'll probably find it does the
same thing, and that the problem you are having is unrelated to
1.11.5 to 1.11.6.

Either way, can you write a small script that adds a file to the
repository, and then issues appropriate commands such that
the problem is reproduced?

>> Unless the files were in binary mode (-kb).
> Is it possible this is a result of the file somehow being in binary
> mode?  How can I tell if a file is slated as binary in the repository?

cvs log filename
and see what is there for "keyword substitution".
"b" is binary.

BFN.  Paul.




>
> Regards,
> Nick




reply via email to

[Prev in Thread] Current Thread [Next in Thread]