[Cvsnt] update weirdness

[Tim Diez]

Hello all,

When I update a file that I have changed locally, it doesn't merge the changes.  cvs will tell me it's been merged:
===================
$ cvs up -A test.txt
M test.txt
===================
but the file doesn't change.  Cvs never takes the file changes from the repository version. The file always stays as the local version.

I've been using cvs for years(on unix systems) and haven't seen this problem.

Has anyone else seen this?

Tim
_______________________________________________
Cvsnt mailing list
Cvsnt at cvsnt.org
http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt