ÕâÌ×Èí¼þºÍÊé±¾¿É°ïÄú׬´óÇ®!
ÄúºÃ£¡ÇëÄãÔÚ°ÙæÖп´Ò»ÏÂÕâÌ×Èí¼þ£¬ÏàÐÅÒ»¶¨»á¶ÔÄãÓÐÓá£ÕâÊÇÕë¶ÔÆóÒµ¹ÜÀíÐèÇó¶ø¶¨ÖƵġ£ÇëÉÏÎÒÃǵÄÍøÖ·Á˽â¸üÏêϸµÄÄÚÈÝ.
http:// www.fu-neng.com
ÆóÒµÏÖ´ú»¯¹ÜÀí²»µ«ÐèÒªÓй淶¡¢¿ÆѧºÍºÏÀíµÄ¹ÜÀíÖƶȣ¬»¹ÐèҪʵÐиßЧÂʵÄÏÖ´úµç×Ó»¯µÄ¹ÜÀí³Ìʽ,²ÅÄÜ»ñµÃ×î´óÏ޶ȵÄЧÒæ
Hi everbody, I have problem in using cvs locks. I
locked a file of newly created module (all file
revisions are 1.1.1.1 and all have same initial and
release tag). When I try to commit this file I get
following error message:
"cvs server: /myRep/myModule/mFile.doc,v:multiple
revisions locked by us
I have somes files that already exist in the trunk and in a few branches.
I now need to bring those files into an already existing branch. How do I do
this? Do I simply copy those files from elsewhere into that branch's sandbox
and then add the branch tag to those files?
--
Jake Colman
We use multiple project branches to seperate the development of new
enhancements to our core product. We use a release branch to create a final
release of a pareticular version of our product; it contains whichever
project branches are deemed shippable. As project branches stabilize, we
merge t
±¾¹«Ë¾×¨ÒµÓ¡ÖÆ£ºÉ̱ê²ÊÓ¡¡¢½ºÓ¡¡¢µÓÂÚ¡¢Í°æÖ½¡¢²£Á§¿¨¡¢·þ×°É̱ꡢPVC¡¢ÂÁ²¡¢
ÂÁÅÆ¡¢ÍÅÆ¡¢ËÜÁÏ°ü×°´ü¡¢¾íͲ²»¸É½º¼°¸÷ÀàÖ¤¼þÐû´«Æ·µÈÓ¡Ë¢ÒµÎñ£¬»¶Ó¹ã´óÐÂÀÏ¿Í»§
À´µçÀ´º¯Ç¢Ì¸ÒµÎñ£¡
ÏêÇéÇëµ½ÍøÕ¾Éϲéѯ
http://www.chenxing.h58.net
E-mail:[EMAIL PROTECTED]
³¿ÐËÓ¡ÒµÉ
In a sandbox sticky to the branch you want to bring the files into, move to the
sandbox directory where the file exists, and even though you don't see them...
> cvs up -jHEAD
> cvs commit
-or from a branch other than the trunk
>cvs up -j
>cvs commit
Mark
--- Jake Colman <[EMAIL PROTECTED]
If you create a branch point tag on a baseline of files you want to branch,
then lock that branch point tag so no one can use it again, you have preserved
the branch point baseline. You can always use that tag to compare things to the
initial image of the basline that started the branch.
Now you
No, there is no chance to get the date of a tag. The best way is to write a
script which can be called by the menu "Macros". All users have to call this
macro when they create a tag. This script writes a log file on your file
server or cvs server with information about user, date, time an tag name
There is no command to remove a module. The only chance is to remove all
files in the module. Then call cvs update with the option -P to delete the
empty module in your working directory. In fact the modul is not removed in
the repository but moved in an "attic" directory. So you always have an
ac
You could also use double quotes around the file name if the file begins
with a pound sign
rm -f "#file"
> -Original Message-
> From: [EMAIL PROTECTED]
> [mailto:[EMAIL PROTECTED]]
> Sent: Wednesday, February 27, 2002 11:25 AM
> To: [EMAIL PROTECTED]
> Subject: Re: How to remove rea
Jake Colman writes:
>
> Is there anything
> special or different about merging between branches as opposed to merging via
> the trunk?
Nope, just use two -j options like you usually do.
-Larry Jones
I think if Santa is going to judge my behavior over the last year,
I ought to be entitled to le
Is there a way to remove a directory from the main trunk, yet keep it around
for use by an earlier branch?
Thanks.
Moises.
_
Chat with friends online, try MSN Messenger: http://messenger.msn.com
__
Moises Zanabria writes:
>
> Is there a way to remove a directory from the main trunk, yet keep it around
> for use by an earlier branch?
CVS only manages files, not directories. If you remove all the files
from the directory on the trunk and use the -P argument to checkout and
update like you
> -Original Message-
> From: Jake Colman [mailto:[EMAIL PROTECTED]]
> Sent: Thursday, February 28, 2002 6:33 AM
> To: [EMAIL PROTECTED]
> Subject: Adding an existing file to a branch
>
>
>
> I have somes files that already exist in the trunk and in a
> few branches.
> I now need to b
Well to answer my own question it looks like it was a problem moving from
1.11 to 1.11.1p1.
The files were created in the respository using a 1.11 client using a
CVSROOT of :ext:user@host:/cvsroot/project (and the cygwin rsh). Checking
out with a 1.11 client again, everything is ok. Checking out
Thanks Larry.
Moises.
>From: [EMAIL PROTECTED] (Larry Jones)
>To: [EMAIL PROTECTED] (Moises Zanabria)
>CC: [EMAIL PROTECTED]
>Subject: Re: delete dir from Main
>Date: Thu, 28 Feb 2002 11:36:15 -0500 (EST)
>
>Moises Zanabria writes:
> >
> > Is there a way to remove a directory from the main trunk
I'm using cvs version 1.11.1p1 with Red Hat Linux 7.2 connecing to an
external server using ssh and ssh-agent. The ssh connections work fine, and
cvs actually works, but the threads don't terminate. I have to kill them
manually. If I don't use ssh-agent, the commands terminate normally, but
Kent Hulick wrote:
>
> I'm using cvs version 1.11.1p1 with Red Hat Linux 7.2 connecing to an
> external server using ssh and ssh-agent. The ssh connections work fine, and
> cvs actually works, but the threads don't terminate. I have to kill them
> manually. If I don't use ssh-agent, the comman
> "Noel" == Noel Yap <[EMAIL PROTECTED]> writes:
Noel>
Noel> Also, search tools will be useless if this programmer were
Noel> programming in Java since the class names would be as meaningless as
Noel> the filenames. I suppose he then could start relying heavily on
Noel> comments.
There is n
Pierre <[EMAIL PROTECTED]> writes:
> Can you use cvs with other file as text file ?
> I think at picture file with .bmp, .gif extention
No, and yes. If you use cvs with binary files without specifying in
some way to cvs that the file is binary, cvs is liable to corrupt your
binary file.
You ca
Helliwell, Matthew writes:
>
> Well to answer my own question it looks like it was a problem moving from
> 1.11 to 1.11.1p1.
>
> The files were created in the respository using a 1.11 client using a
> CVSROOT of :ext:user@host:/cvsroot/project (and the cygwin rsh). Checking
> out with a 1.11 cli
We currently have 3 active development branches as well as our trunk.
Our trunk holds our next major release. Branches A, B, and C hold our
next three major releases (in that order). About once a week, we merge
the incremental changes (since the last merge) from the trunk, to branch
A, then from
We have encountered an interesting problem to which I hope there is a
solution. In our CVS repository there are a large amount of media files in
modules that are sub-modules of the main distribution module. Here's an
example (greatly simplified).
dist
-non-media1
-non-media1.1
On Thu, Feb 28, 2002 at 01:42:01PM +0100, Wolfgang Pröpper wrote:
> No, there is no chance to get the date of a tag. The best way is to write a
> script which can be called by the menu "Macros". All users have to call this
> macro when they create a tag.
Or if you're using command-line CVS, wrap
What is the reason for locking the repository? Normally, it's to avoid
race conditions, e.g. when a commit is done on one of the branches involved
in the merge.
You can avoid locking if you know the version numbers of the contributors
beforehand, or can otherwise identify them uniquely (e.g. wit
On Wed, Feb 27, 2002 at 03:59:17PM -0800, Claude Johnson wrote:
> From reading some of the docs about NetBSD's and FreeBSD's
> release processes, I have noticed that they both use what
> FreeBSD calls "branch point" tags. Not having a lot of
> experience with CVS, I don't quite understand what pro
How do I commit a large number of changes (generated by a merge) to
the branch I'm merging to when there are several commits to that
branch while I'm in the process of merging? And if I do update before
commiting the merge (to bring in the new changes so that I'm allowed
to check in) is there a w
In other words, others have committed to your target branch before you
finished resolving conflicts and committed your work, right?
What exactly do you want to do in that situation? Do you want to update
to the top of the branch before committing, or do you want to commit first?
You can't commit
On Thu, Feb 28, 2002 at 02:22:13PM -0800, Paul Sander wrote:
> In other words, others have committed to your target branch before you
> finished resolving conflicts and committed your work, right?
>
Yes.
> What exactly do you want to do in that situation? Do you want to update
> to the top of
In that case, commit your first merge to a new branch and repeat the process
until you get in.
>--- Forwarded mail from [EMAIL PROTECTED]
>On Thu, Feb 28, 2002 at 02:22:13PM -0800, Paul Sander wrote:
>> In other words, others have committed to your target branch before you
>> finished resolving
On Thu, Feb 28, 2002 at 02:22:13PM -0800, Paul Sander wrote:
> In other words, others have committed to your target branch before you
> finished resolving conflicts and committed your work, right?
> [...]
> This raises the issue of a race condition that is inherent in the
> concurrent development
I'm trying to get CVS to run with GSSAPI. We have a non-standard
installation of kerberos so I've had to hack the make files to pick up
the libraries. Specifically I added or defined the following in the
src/Makefile
cvs_LDADD = \
../diff/libdiff.a \
../lib/libcvs.a \
..
Yeah, I agree. The ssh threads don't terminate either. I can't tell which
is causing which, though.
It would seem to me, however that the ssh threads would bw waiting for the
cvs threads to finish their businss and give a terminate command, rather
than the cvs threads waiting for ssh, which
"Ben Baker" <[EMAIL PROTECTED]> writes:
>dist
>-non-media1
> -non-media1.1
>-non-media2
>-non-media3
> -media // Here's the media. It's embedded within the dist tree
>-non-media4
>[ ... ] However, it would also help our build process a
>great deal to be able
"Wolfgang Pröpper" wrote:
> No, there is no chance to get the date of a tag.
"cvs history -T", when history logging is enabled, returns dates of all "rtag"
operations. Using "rtag -r" to tag a specific version gets around the
indeterminancy of "rtag".
Details (very murky) at http://www.cvshome.
Ò»ÒÚËÄǧÍòµç×ÓÓÊÏ䣨EMAIL£©µØÖ·£¨¹úÄÚ¸÷ÐÐÒµ¼°¸öÈË·ÖÀࣩÊý¾Ý¿â
¹ú¼ÊʮһÒÚÎéǧÍòµç×ÓÓÊÏ䣨EMAL£©µØÖ·Êý¾Ý¿â
ÓÀÔ¶³Ðŵ£ºÖÕÉúÃâ·Ñ¸üÐÂÉý¼¶¡£ÔùËÍȺ·¢Èí¼þ¡£
×Éѯµç»°£¨027-86777009£©
ÖйúÎ人ÕñÒµ¹«Ë¾ µç×ÓÉÌÎñ²¿
___
Info-cvs mailing list
[EMAIL PROTECTED]
--- "Mark A. Flacy" <[EMAIL PROTECTED]> wrote:
> > "Noel" == Noel Yap <[EMAIL PROTECTED]>
> writes:
> Noel>
> Noel> Also, search tools will be useless if this
> programmer were
> Noel> programming in Java since the class names
> would be as meaningless as
> Noel> the filenames. I suppose he
I'm in the process of making a release of a pretty popular GNU package,
and need to restructure the directories in the package itself a bit.
Basically the toplevel directory has accumulated some source files (*.c,
*.cc) and there are some other changes, but my question is this..
As I move
> "Noel" == Noel Yap <[EMAIL PROTECTED]> writes:
Noel>
Noel> The following output suggests otherwise:
Noel>
Noel> nyap:jpmpsdev@EQUINOX:~/proj/asdf> cat Asdf.java
Noel> public class Aoeu
Noel> {
Noel> public static void main(String[] args)
Noel> {
Noel> System
ÒøºÓÖ®ÐDZ¶Êܹã´óÍøÃñ¹Ø°®£¬ÍƼö¸÷ÀྫƷվµãÈçÏ£º
ÍƼöÕ¾µãÒ»
ÍøÉϹºÎïÉ̳ǣº
ͼÊ飬ӰÊÓ£¬ÒôÀÖ£¬ÓÎÏ·£¬Èí¼þ
ÍøÉϹºÎïµÄÀÖÔ°¾¡ÔÚµ±µ±ÊéÎÝ¡£È«¹ú×î´óµÄÍøÉϹºÎïÃÅ»§ÍøÕ¾Ö®Ò»£¬ÐÅÓþÒ»Á÷£¬»õÔ´³ä×㣬Ìṩ¶àÖÖÖ§¸¶·½Ê½¡£
¸Ï¿ì¼ÓÈë×îʱÉеĹºÎïÒ»×å
µ±µ±ÊéÎÝ£ºhttp://www.dangdang.com/lianmeng/league/login/login.asp
40 matches
Mail list logo
