Fwd: Ask fro Help: cvs commit error when update version from 1.x to 2

info-cvs

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Fwd: Ask fro Help: cvs commit error when update version from 1.x to 2

From:	Russ Sherk
Subject:	Fwd: Ask fro Help: cvs commit error when update version from 1.x to 2
Date:	Tue, 3 Jan 2006 08:08:00 -0500

Please post messages to address@hidden.

Before you go any further, read the section on revisions in the cvs manual: http://ximbiot.com/cvs/manual/cvs-1.11.21/cvs_4.html#SEC44

CVS version numbers are used internally by CVS and are not the same as your product revision. Each file in a product's version will have a different CVS version number. You must use CVS tags to mark product versions.

--Russ

---------- Forwarded message ----------
From: 李剑飞 <address@hidden>
Date: Jan 2, 2006 8:50 PM
Subject: Ask fro Help: cvs commit error when update version from 1.x to 2
To: address@hidden

Hello, Could you help me to solve the following question?
I am an amateur programmer. Recently I am working at a small program with Visual C++ 6.0.
I setup CVSNT server(2.0.51b), and install some CVS clients, including WinCVS 1.2, WinCVS 1.3,
WinCVS 2.0, and Jalindi's igloo CVS plug-in 1.0.3 for Visual Studio. The accumulation of my
source code from 1.1 to 1.11 is very easy not only with igloo plugin but also with WinCVS 2.0.
But now I have completed my source code fro a summary or mile-stone release. My hope is to
conclude the 1.1 version of the source code, and begin my later work with 2.0 or higher version.
But I come across a strange CVS error when I use "CVS commit -r 2" command after "CVS update"
command is excuted successfully. The detailed error result is as follows:
---------------------------------------------------------------------------
cvs server: Numeric -r option must specify version on the same branch
cvs server: Up-to-date check failed for `clex001_c.cpp'
cvs server: Numeric -r option must specify version on the same branch
cvs server: Up-to-date check failed for `mdimenu.rc'
cvs [server aborted]: correct above errors first!
---------------------------------------------------------------------------
And I am asking for help from CVS fans if they can solve this difficult problem.
Could you tell me how can I successfully upgrade the version of my source code from
1.x to 2.0? Thanks very much.
The following command and excution result is copied under WinCVS 1.3 window.
Some starting version is checked in with WinCVS 2.0, The I use igloo plug-in to
check in. The last few version is checked in using WinCVS 1.3. Do the different clients matter?

_____________________________________________________________________________

cvs log clex001_c.cpp mdimenu.rc (in directory F:\9Jianfei\9MyProg\clex001\clex001_c\)

***** CVS exited normally with code 0 *****

Rcs file : '\cvs\mail/clex001_c/clex001_c.cpp,v'
Working file : 'clex001_c.cpp'
Head revision : 1.11
Branch revision :
Locks : strict
Access :
Symbolic names :
1.11 : 'tag1225'
1.10 : 'tag_ok'
1.8.0.2 : 'branch-release-2-0'
1.7 : 'tag_20051221_TheFirstVersion_Of_My_Win32'
Keyword substitution : 'kv'
Total revisions : 11
Selected revisions : 11
Description :

----------------------------
Revision : 1.11
Date : 2005/12/24 13:52:11
Author : 'lzf'
State : 'Exp'
Lines : +1 -1
Keyword : 'kv'
CommitID : '2f843ad5281368b'
Description :
filename: clex001_c.cpp;
dfgfg

----------------------------
Revision : 1.10
Date : 2005/12/24 11:17:48
Author : 'lzf'
State : 'Exp'
Lines : +1 -1
Keyword : 'kv'
CommitID : '2a443ad2e5a407c'
Description :
filename: clex001_c.cpp;
aaaa

----------------------------
Revision : 1.9
Date : 2005/12/24 11:3:42
Author : 'lzf'
State : 'Exp'
Lines : +1 -1
Keyword : 'kv'
CommitID : '2ac43ad2b0c35b2'
Description :
filename: clex001_c.cpp;
no message

----------------------------
Revision : 1.8
Date : 2005/12/21 14:3:10
Author : 'lzf'
State : 'Exp'
Lines : +1 -1
Keyword : 'kv'
CommitID : '34c43a9609d54ab'
Description :
filename: clex001_c.cpp;
no message

----------------------------
Revision : 1.7
Date : 2005/12/18 12:11:43
Author : 'lzf'
State : 'Exp'
Lines : +9 -2
Keyword : 'kv'
CommitID : '52c43a551fe14f8'
Description :
filename: clex001_c.cpp;
no message

----------------------------
Revision : 1.6
Date : 2005/12/18 11:54:18
Author : 'lzf'
State : 'Exp'
Lines : +9 -1
Keyword : 'kv'
CommitID : '52043a54dea07a6'
Description :
filename: clex001_c.cpp;
no message

----------------------------
Revision : 1.5
Date : 2005/12/17 23:43:6
Author : 'lzf'
State : 'Exp'
Lines : +85 -8
Keyword : 'kv'
CommitID : '52043a4a2895800'
Description :
filename: clex001_c.cpp;
no message

----------------------------
Revision : 1.4
Date : 2005/12/14 12:59:43
Author : 'lzf'
State : 'Exp'
Lines : +8 -1
Keyword : 'kv'
CommitID : '1ec43a0173e012c'
Description :
filename: clex001_c.cpp;
no message

----------------------------
Revision : 1.3
Date : 2005/12/14 12:46:42
Author : 'lzf'
State : 'Exp'
Lines : +39 -4
Keyword : 'kv'
CommitID : '29843a014317736'
Description :
filename: clex001_c.cpp;
no message

----------------------------
Revision : 1.2
Date : 2005/11/30 12:28:51
Author : 'lzf'
State : 'Exp'
Lines : +9 -1
Keyword : 'kv'
CommitID : '308438d9b0223b0'
Description :
filename: clex001_c.cpp;
no message

----------------------------
Revision : 1.1
Date : 2005/11/20 0:25:54
Author : 'lzf'
State : 'Exp'
Lines : +0 0
Keyword : 'kv'
CommitID : '4ec437fc2916d08'
Description :
filename: clex001_c.cpp;
no message

===============================================
Rcs file : '\cvs\mail/clex001_c/mdimenu.rc,v'
Working file : 'mdimenu.rc'
Head revision : 1.3
Branch revision :
Locks : strict
Access :
Symbolic names :
1.3 : 'tag_ok'
1.3.0.2 : 'branch-release-2-0'
1.3 : 'tag_20051221_TheFirstVersion_Of_My_Win32'
Keyword substitution : 'kv'
Total revisions : 3
Selected revisions : 3
Description :

----------------------------
Revision : 1.3
Date : 2005/12/17 23:43:25
Author : 'lzf'
State : 'Exp'
Lines : +2 -1
Keyword : 'kv'
CommitID : '51843a4a29c583e'
Description :
filename: mdimenu.rc;
no message

----------------------------
Revision : 1.2
Date : 2005/12/14 12:59:55
Author : 'lzf'
State : 'Exp'
Lines : +1 -1
Keyword : 'kv'
CommitID : '39843a0174a0154'
Description :
filename: mdimenu.rc;
no message

----------------------------
Revision : 1.1
Date : 2005/11/30 12:58:22
Author : 'lzf'
State : 'Exp'
Lines : +0 0
Keyword : 'kv'
CommitID : '3ec438da1ee3a4a'
Description :
filename: mdimenu.rc;
no message

===============================================
cvs status -v clex001_c.cpp mdimenu.rc (in directory F:\9Jianfei\9MyProg\clex001\clex001_c\)
===================================================================
File: clex001_c.cpp Status: Up-to-date

Working revision: 1.11
Repository revision: 1.11 \cvs\mail/clex001_c/clex001_c.cpp,v
Expansion option: kv
Commit Identifier: 2f843ad5281368b
Sticky Tag: (none)
Sticky Date: (none)
Sticky Options: (none)
Merge From: (none)

Existing Tags:
tag1225 (revision: 1.11)
tag_ok (revision: 1.10)
branch-release-2-0 (branch: 1.8.2)
tag_20051221_TheFirstVersion_Of_My_Win32 (revision: 1.7)

===================================================================
File: mdimenu.rc Status: Up-to-date

Working revision: 1.3
Repository revision: 1.3 \cvs\mail/clex001_c/mdimenu.rc,v
Expansion option: kv
Commit Identifier: 51843a4a29c583e
Sticky Tag: (none)
Sticky Date: (none)
Sticky Options: (none)
Merge From: (none)

Existing Tags:
tag_ok (revision: 1.3)
branch-release-2-0 (branch: 1.3.2)
tag_20051221_TheFirstVersion_Of_My_Win32 (revision: 1.3)

***** CVS exited normally with code 0 *****
cvs update

***** CVS exited normally with code 0 *****

? ReadMe.txt
? StdAfx.cpp
? StdAfx.h
? clex001.dsw
? clex001.ncb
? clex001.opt
? clex001_c.dsp
? clex001_c.dsw
? clex001_c.ncb
? clex001_c.opt
? clex001_c.plg
? mdimenu.aps
? resource.h
cvs server: Updating .
cvs update -A -C clex001_c.cpp mdimenu.rc (in directory F:\9Jianfei\9MyProg\clex001\clex001_c\)

***** CVS exited normally with code 0 *****

cvs commit -m asdf -r 2

***** CVS exited normally with code 1 *****

cvs commit: Examining .
? resource.h
? mdimenu.aps
? clex001_c.plg
? clex001_c.opt
? clex001_c.ncb
? clex001_c.dsw
? clex001_c.dsp
? clex001.opt
? clex001.ncb
? clex001.dsw
? StdAfx.h
? StdAfx.cpp
? ReadMe.txt
cvs server: Numeric -r option must specify version on the same branch
cvs server: Up-to-date check failed for `clex001_c.cpp'
cvs server: Numeric -r option must specify version on the same branch
cvs server: Up-to-date check failed for `mdimenu.rc'
cvs [server aborted]: correct above errors first!

_____________________________________________________________________________

===============================================
Skype网络电话再降费率，国际长途每分钟只1毛7，8月31号之前可得话费

心动在TOM，注册邮箱不后悔！

全面升级至大容量，高速度，超安全。还等什么呢！

明星送祝福(http://sr.tom.com)：周杰伦蔡依林王力宏田震 &nbsp代您送去生日祝福

万首金曲免费送(http://mm.tom.com/ivr/) ：你到底爱谁千年之恋我是真的爱你一辈子做你的女孩

全部彩铃免费送(http://mm.tom.com/cailing/)：我发财了发财了你喜欢我就说嘛两只蝴蝶冲动的惩罚
===============================================

[Prev in Thread]

Current Thread

[Next in Thread]

Fwd: Ask fro Help: cvs commit error when update version from 1.x to 2, Russ Sherk <=

Prev by Date: Recursive Comparision of files in working directory with repository
Next by Date: Re: Recursive Comparision of files in working directory with repository
Previous by thread: Recursive Comparision of files in working directory with repository
Next by thread: Managing a project in multiple directories?
Index(es):
- Date
- Thread