[Top][All Lists]

[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: Fri, 27 Jun 2003 22:59:32 GMT

"Nick" <saber850@yahoo.com> wrote in message 
> I recently upgraded from 1.11.5 to 1.11.6 and noticed updates (via cvs
> update) completely overwrite my local copy w/ the latest revision in the
> repository when there's a conflict.  This didn't happen in 1.11.5, is it
> normal for 1.11.6?

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.

Number 2 is normal and happens the same way on cvs 1.11.5
and cvs 1.11.6.

If you are experiencing number 1, you more likely confused
yourself - try reproducing the problem with a script to prove
it happens.

BFN.  Paul.

reply via email to

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