[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: |
Thu, 05 Apr 2007 19:59:28 +0000 |
User-agent: |
Mozilla/5.0 (X11; U; Linux i686; en-US; rv:1.7.6) Gecko/20050317 Firefox/1.0.7 Galeon/1.3.19 |
URL:
<http://savannah.nongnu.org/bugs/?19528>
Summary: "cvs update -C" won't revert files containing
conflicts
Project: Concurrent Versions System
Submitted by: None
Submitted on: Thursday 04/05/2007 at 19:59 UTC
Category: Bug Report
Severity: 3 - Normal
Item Group: None
Status: None
Privacy: Public
Assigned to: None
Open/Closed: Open
Discussion Lock: Any
Release:
Fixed Release: None
Fixed Feature Release: None
_______________________________________________________
Details:
Hi all,
After upgrading our cvs server from 1.11 to 1.11.22, we're seeing some
problems/differences.
One obvious thing is that if a 'cvs update' operation resulted in a Conflict
in a file, you can no longer do a "cvs update -C file.cpp" to revert the
whole thing.
If you try, you get this:
(Locally modified file.cpp moved to .#file.cpp.1.4)
C file.cpp
and the file remains, still containing the conflicts.
When the server was 1.11, this would do what the documentation says "update
-C" does, namely: "Overwrite the locally modified files with clean copies
from the repository".
As a subtle variant, if you 'touch' the conflicted file (as instructed in
section 10.3 of the manual), you get a somewhat different message. The
problem remains though...
(Locally modified file.cpp moved to .#file.cpp.1.4)
cvs update: warning: file.cpp was lost
cvs update: move away ./file.cpp; it is in the way
C file.cpp
Note that this seems to be a known/reported problem, but I haven't
encountered any solution:
http://groups.google.ca/group/gnu.cvs.bug/browse_thread/thread/8b84515e92359d1f/c2934e9e68e87a47?lnk=st&q=cvs+%22update+-C%22+not+working&rnum=5#c2934e9e68e87a47
_______________________________________________________
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 <=