[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[bug #19528] "cvs update -C" won't revert files containing conflicts

From: Jeremy
Subject: [bug #19528] "cvs update -C" won't revert files containing conflicts
Date: Wed, 02 Feb 2011 01:11:14 +0000
User-agent: Mozilla/5.0 (X11; U; Linux; en-GB) AppleWebKit/532.4 (KHTML, like Gecko) konqueror/4.4.4 Safari/532.4

Follow-up Comment #5, bug #19528 (project cvs):

After much more extensive checking, I don't believe this ever worked as
described in the manual. Files with conflicts never reach the point in the
code where the -C flag operates.
The cmd sent to the server returns with a non-zero error code (when there is
a conflict) and the update() function returns before ever getting to the point
where it checks for an overwrite selection.

This behaviour also seems to have been replicated in OpenCVS (in order to
retain compatibility I guess)

The best "fix" at this point would probably be to update the documentation
for the -C option for cvs update.


Reply to this item at:


  Message sent via/by Savannah

reply via email to

[Prev in Thread] Current Thread [Next in Thread]