[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: 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


                 Summary: "cvs update -C" won't revert files containing
                 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
           Fixed Release: None
   Fixed Feature Release: None



Hi all,
After upgrading our cvs server from 1.11 to 1.11.22, we're seeing some

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:


Reply to this item at:


  Message sent via/by Savannah

reply via email to

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