Re: merge losing changes, no Conflict

[Markus Warg]

Larry,

okay, from my understanding of the manual someone must have interrupted
his commit. But in this case you don't lose data, right? So deleting
the files should be safe and they should not reappear until someone
breaks off commit next time...

thx

Markus

On Don, 08 Nov 2001, Larry Jones wrote:

> Markus Warg writes:
> > 
> > I thought only #cvs.lock directories are for locking?
> 
> No.  See <http://www.cvshome.org/docs/manual/cvs_2.html#SEC17>. 
> 
> -Larry Jones
> 
> Fortunately, that was our plan from the start. -- Calvin

-- 
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
http://www.vianetworks.de
Alle Angebote sind unverbindlich.
Auftraege erledigen wir zu unseren allgemeinen Geschaeftsbedingungen.