bugConcurrent Versions System - Bugs: bug #19528, "cvs update -C" won't...

 
 

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

Submitted by:  None
Submitted on:  Thu 05 Apr 2007 07:59:27 PM UTC  
Votes:  1  
 
Category: Bug ReportSeverity: 3 - Normal
Item Group: NoneStatus: None
Privacy: PublicAssigned to: None
Open/Closed: OpenRelease: 
Fixed Release: NoneFixed Feature Release: None

Add a New Comment (Rich MarkupRich Markup):
   

You are not logged in

Please log in, so followups can be emailed to you.

 

Wed 02 Feb 2011 01:11:14 AM UTC, comment #5:

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.

Jeremy <jammer5>
Tue 01 Feb 2011 10:59:10 PM UTC, comment #4:

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.

Anonymous
Fri 09 May 2008 03:27:03 PM UTC, comment #3:

Applied patch from http://savannah.nongnu.org/bugs/?17565. Make check passes with no errors. Seems to be fixed.

(file #15644)

Eugen Zglimbea <eugenzglimbea>
Thu 08 May 2008 08:18:20 PM UTC, comment #2:

Should be dependent on http://savannah.nongnu.org/bugs/?17565

Eugen Zglimbea <eugenzglimbea>
Wed 18 Apr 2007 11:35:36 AM UTC, comment #1:

Perhaps this is related to
http://savannah.nongnu.org/bugs/?17565

Susanne Bertling <susbert>
Thu 05 Apr 2007 07:59:27 PM UTC, original submission:

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

Anonymous

 

(Note: upload size limit is set to 16384 kB, after insertion of the required escape characters.)

Attach File(s):
   
   
Comment:
   

Attached Files
file #15644:  conflict.patch added by eugenzglimbea (2kB - application/octet-stream)

 

Depends on the following items: None found

Items that depend on this one: None found

 

Carbon-Copy List
  • -unavailable- added by jammer5 (Posted a comment)
  • -unavailable- added by eugenzglimbea (Posted a comment)
  • -unavailable- added by susbert (Posted a comment)
  •  

    Do you think this task is very important?
    If so, you can click here to add your encouragement to it.
    This task has 1 encouragement so far.

    Only logged-in users can vote.

     

    Please enter the title of George Orwell's famous dystopian book (it's a date):

     

     

    Follow 2 latest changes.

    Date Changed By Updated Field Previous Value => Replaced By
    Fri 09 May 2008 03:27:03 PM UTCeugenzglimbeaAttached File-=>Added conflict.patch, #15644
    Wed 18 Apr 2007 11:35:36 AM UTCsusbertCarbon-Copy-=>Added susbert

    Back to the top


    Powered by Savane 3.1-cleanup