[cvsnt] Re: How to get back the local modified file after update?

[Gerhard Fiedler]

Andreas Tscharner wrote:

> Bo Berglund wrote:
>>> Isn't there always a backup file with the original content created by
>>> cvsnt (the .# type files)? 
>>> 
>> There are a few such files, but I don't know *when* they are created.
>> Normally there are no such files for ordinary updates. Maybe they get
>> created when there is a conflict?
> 
> They get created whenever cvs tries to merge. It does not matter whether
> or not the merge is successful. 

That's my experience, too. You should find the file that was merged backed
up exactly as it was before the merge.

Gerhard