[Top][All Lists]

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

Re: merge losing changes, no Conflict

From: Markus Warg
Subject: Re: merge losing changes, no Conflict
Date: Wed, 7 Nov 2001 09:25:07 +0100
User-agent: Mutt/1.2.4i


BTW: I found some .# files (not lockdirectories) in our repository, too.
Is it okay to have them there or is it a sign that something went

I don't experience the described problems, just curious.


On Die, 06 Nov 2001, Larry Jones wrote:

> Dave Thorn writes:
> > 
> > However, several times recently I have found code to mysteriously
> > stop working (investigation suggests this is after someone else
> > commits changes to the file), not through compile errors, but logic,
> > and when I look, the changes I made recently have gone.  There were
> > a few .# files hanging around in the directory, which contained my
> > changes, but the cvs update did *not* report a Conflict, which I
> > understand and can easily deal with.  The changes don't even appear
> > to have been at similar places within the file, so I don't
> > understand why there are problems.  Is this expected behaviour?
> No, of course it's not expected behavior.  By far the most frequent
> cause of "lost changes" is someone doing an update on a file while they
> have it open in a text editor and then later saving the file from the
> editor (perhaps by exiting) and overwriting the updated file.
> -Larry Jones
> Everybody's a slave to routine. -- Calvin
> _______________________________________________
> Info-cvs mailing list
> address@hidden

Markus Warg
VIA NET.WORKS Deutschland GmbH, Bismarckstrasse 120, D-47057 Duisburg
Geschäftsführung: Matt Nydell, Wim Vink. Amtsgericht Duisburg, HRB 7672
Phone: +49 203-3093 159, Fax: +49 203-3093 112
E-Mail: address@hidden
Alle Angebote sind unverbindlich.
Auftraege erledigen wir zu unseren allgemeinen Geschaeftsbedingungen.

reply via email to

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