bugConcurrent Versions System - Bugs: bug #14776, cvs update from HEAD to branch...

 
 

bug #14776: cvs update from HEAD to branch with -n option fails

Submitter:  None
Submitted:  Thu 13 Oct 2005 03:03:37 PM UTC
   
 
Category:  None Severity:  3 - Normal
Item Group:  None Status:  None
Privacy:  Public Assigned to:  None
Open/Closed:  Open Release: 
Fixed Release:  None Fixed Feature Release:  None
* Mandatory Fields

Add a New Comment Rich Markup
   

Wed 04 Feb 2009 03:51:33 PM UTC, comment #1: 

The same bug.


Client (Ubuntu Linux 8.10):

agnislav@agnislav-desktop:/$ cvs -v

Concurrent Versions System (CVS) 1.12.13 (client/server)
...


Server (FreeBSD 7.0-RELEASE):

[agnislav@agnislav-server ~]$ cvs -v

Concurrent Versions System (CVS) 1.11.17-FreeBSD (client/server)
...

Anonymous
Thu 13 Oct 2005 03:03:37 PM UTC, original submission:  

I created a tag on the HEAD.
I branched the project from the tag
I updated to the branch tag
My colleague updated some files on the HEAD
I tried to merge the changes from the HEAD to my branch, but being  cautious I used the "-n" option to supress the actual changes from being implemented.  The command failed indicating  "No such file or directory".
Running the same command for "real" worked fine.

I am running on Linux RHEL 3

>cvs --version


Concurrent Versions System (CVS) 1.11.2 (client/server)

Copyright (c) 1989-2001 Brian Berliner, david d `zoo' zuhn,
                        Jeff Polk, and other authors

CVS may be copied only under the terms of the GNU General Public License,
a copy of which can be found with the CVS distribution kit.

Specify the --help option for further information about CVS


Both client and server are RHEL 3 with the same patch, but they are different hosts.

Here is the console output of my attempts:



(2302) mardi_gras>cvs stat cfg/core.cfg
===================================================================
File: core.cfg          Status: Up-to-date

   Working revision:    1.34
   Repository revision: 1.34    /W/cvs/cvsroot/mardi_gras/cfg/core.cfg,v
   Sticky Tag:          intelligence_dev (branch: 1.34.2)
   Sticky Date:         (none)
   Sticky Options:      (none)

(2303) mardi_gras>cvs -nq up -j HEAD cfg/core.cfg
RCS file: /W/cvs/cvsroot/mardi_gras/cfg/core.cfg,v
retrieving revision 1.34
retrieving revision 1.35
Merging differences between 1.34 and 1.35 into core.cfg
cvs server: core.cfg: No such file or directory
(2304) mardi_gras>cvs -nq up -j intelligence_dev -j HEAD cfg/core.cfg
RCS file: /W/cvs/cvsroot/mardi_gras/cfg/core.cfg,v
retrieving revision 1.34
retrieving revision 1.35
Merging differences between 1.34 and 1.35 into core.cfg
cvs server: core.cfg: No such file or directory
(2305) mardi_gras>cvs stat cfg/core.cfg
===================================================================
File: core.cfg          Status: Up-to-date

   Working revision:    1.34
   Repository revision: 1.34    /W/cvs/cvsroot/mardi_gras/cfg/core.cfg,v
   Sticky Tag:          intelligence_dev (branch: 1.34.2)
   Sticky Date:         (none)
   Sticky Options:      (none)
(2306) mardi_gras>cvs -q up -j intelligence_dev -j HEAD cfg/core.cfg
RCS file: /W/cvs/cvsroot/mardi_gras/cfg/core.cfg,v
retrieving revision 1.34
retrieving revision 1.35
Merging differences between 1.34 and 1.35 into core.cfg


Anonymous

 

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

Attach Files:
   
   
Comment:
   

No files currently attached

 

Depends on the following items: None found

Items that depend on this one: None found

 

CC list is empty

 

There are 0 votes so far. Votes easily highlight which items people would like to see resolved in priority, independently of the priority of the item set by tracker managers.

Only logged-in users can vote.

 

No changes have been made to this item

Back to the top

Powered by Savane 3.13-758e.
Corresponding source code