hi, I had a look in a couple of books and around the web but can't find this problem mentioned.
The merge process was explained to me as this: when cvs update finds that you've modified a file it was going to update, it saves your modified version under a .# name, then merges your changes with the repository changes and puts the resulting merged file into your working directory in place of your old modified file. 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? system: i686, debian linux (testing), kernel 2.4.9 thanks for any help, -- dave thorn | [EMAIL PROTECTED] _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs
