[Top][All Lists]

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

Re: 1.11.6 Update broken

From: Sabertooth
Subject: Re: 1.11.6 Update broken
Date: 30 Jun 2003 01:47:11 -0700

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.


reply via email to

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