Tim Diez wrote: > 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. > 'M' means that file is locally modified but not committed to the repository. It isn't supposed to change.
Tony _______________________________________________ Cvsnt mailing list [EMAIL PROTECTED] http://www.cvsnt.org/cgi-bin/mailman/listinfo/cvsnt
