[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug #17565] update -A removes conflict
|
From: |
Susanne Bertling |
|
Subject: |
[bug #17565] update -A removes conflict |
|
Date: |
Thu, 21 Sep 2006 11:40:35 +0000 |
|
User-agent: |
Mozilla/5.0 (Windows; U; Windows NT 5.1; en-US; rv:1.8.0.6) Gecko/20060728 Firefox/1.5.0.6 |
Follow-up Comment #2, bug #17565 (project cvs):
Sorry for posting as anonymous and thanks for your comment. I'm new to
Savannah, not to CVS. I first emailed to bug-cvs@nongnu.org without any
reaction.
I'm not using cvsnt. -kx stands for the different substitutions modes -kk,
-kkv, -kb, -ko, etc. (Ok not very clever but I didn't know -kx is used in
cvsnt) Oh, and I used a wrong terminology, I meant sticky '-k' options when
writing about sticky tags.
I used before Version 1.11.13 where cvs update -A leaves files with conflicts
as they are.
In the manual
http://ximbiot.com/cvs/manual/cvs-1.11.22/cvs_16.html#SEC154
the description for update -A is
"Reset any sticky tags, dates, or `-k' options. Does not reset sticky `-k'
options on modified files. See Sticky tags, for more information on sticky
tags/dates."
So I still think it's a bug.
_______________________________________________________
Reply to this item at:
<http://savannah.nongnu.org/bugs/?17565>
_______________________________________________
Nachricht geschickt von/durch Savannah
http://savannah.nongnu.org/