Sergei Organov wrote:
Martin Jørgensen <[EMAIL PROTECTED]> writes:
-snip-
Then why did you put it under the CVS control in the first place?!
Because sometimes that is the easiest thing to do under windows using drag and drop.
Overall, my advice is to move report.log out of CVS control: $ rm report.log $ cvs remove report.log $ echo "report.log" >> .cvsignore $ cvs ci -m"Removed report.log" report.log .cvsignore
I still don't see why cvs update cares about my local file and wants to merge anything that I on purpose didn't want to commit...
But okay as long as it doesn't bug me anymore... Best regards / Med venlig hilsen Martin Jørgensen -- --------------------------------------------------------------------------- Home of Martin Jørgensen - http://www.martinjoergensen.dk _______________________________________________ Info-cvs mailing list [email protected] http://lists.nongnu.org/mailman/listinfo/info-cvs
