[bug #17565] update -A removes conflict

[Arthur Barrett]

Follow-up Comment #1, bug #17565 (project cvs):

The reference to cvs update -kx makes me think that perhaps this user is
really using CVSNT/TortoiseCVS/WinCVS.  Savannah CVS does not have a -kx
switch:
http://ximbiot.com/cvs/manual/cvs-1.11.22/cvs_12.html#SEC101
versus:
http://www.cvsnt.org/manual/html/Substitution-modes.html

If so you should contact the CVSNT newsgroup.

Also I think that "cvs update -A" has never paid attention to conflicts in
the file, if the file had a sticky tag, it's cleared and updated to the new
version.  If you are new to CVS I suggest you ask questions on the newsgroup
- not simply post bugs.

Finally - using a real username/email address will make it easier for people
to contact you to help you.

    _______________________________________________________

Reply to this item at:

  <http://savannah.nongnu.org/bugs/?17565>

_______________________________________________
  Message sent via/by Savannah
  http://savannah.nongnu.org/