[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug #19528] "cvs update -C" won't revert files containing conflicts
From: |
anonymous |
Subject: |
[bug #19528] "cvs update -C" won't revert files containing conflicts |
Date: |
Tue, 01 Feb 2011 22:59:11 +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 #4, bug #19528 (project cvs):
I know this is an old bug but it is still present in the latest code.
I've built this on:
v1.11.17 (stable)
v1.11.23 (stable)
v1.12.13 (feature)
both with and without the patch mentioned in
http://savannah.nongnu.org/bugs/?17565
This is not fixed. The documented behaviour of: cvs update -C file is to
replace the working version with a clean copy. If there is a conflict in the
local file, this remains after the update.
_______________________________________________________
Reply to this item at:
<http://savannah.nongnu.org/bugs/?19528>
_______________________________________________
Message sent via/by Savannah
http://savannah.nongnu.org/
- [bug #19528] "cvs update -C" won't revert files containing conflicts,
anonymous <=