Re: Newbie: problems adding directory to repository

2003-08-14 Thread Jesse Sheidlower
On Thu, Aug 14, 2003 at 04:01:45PM +0200, Julien Wajsberg wrote:
 
 You have to use cvs update -dP on your server sandbox to create new
 directories and delete empty one in a workign directory.

I've tried this, and it doesn't work:

- begin included text -
gossypiboma~/cvs/library/modules $ ls
CVS   Field.pm  FieldList.pm  Session.pmWebDB.pm
Field FieldList MyDatabase.pm WebDB
gossypiboma~/cvs/library/modules $ cvs update -dP
cvs update: Updating .
cvs update: Updating Book
cvs update: Updating Book/SearchDisplayView
cvs update: Updating Field
cvs update: Updating FieldList
cvs update: Updating View
cvs update: Updating WebDB
gossypiboma~/cvs/library/modules $ ls
CVS   Field.pm  FieldList.pm  Session.pmWebDB.pm
Field FieldList MyDatabase.pm WebDB
gossypiboma~/cvs/library/modules $ 
- end included text -

The old Book/ directories/files aren't added, but neither is
the MyDatabase/ directory, which is what I'm trying to get.

Jesse Sheidlower


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: Howto?

2003-08-14 Thread Rob Helmer
Hello,

On Thu, Aug 14, 2003 at 04:11:01PM +0300, Stephen Biggs wrote:
 1. Rename a module in the repository? Is it even possible? That way, the
 next time somebody checks out the entire module, the directory name will
 have the change?

I usually do this :

1) copy the module in the repository to the new name
2) checkout the old repository, recursively remove everything

That way, anyone doing an update on an old checkout won't just get
weird errors, everything will start being removed (which is consistent
with reality). However, they can still pull old versions that were in
that repository.


 2. If I checkout a module from one repository, say from the Internet,
 and then import it into a second repository, say my local one, is there
 an easy and correct way to make sure that the local copy is also updated
 by the changes in the remote repository?  That is, I want to do an
 update from the remote repository in my local directory and then be able
 to merge and commit those changes to my local repository?


Not easy or correct.. :) You could look at CVSup, or Rsync if you want
to have a master/slave-style mirror relationship. However, if these are
supposed to both be active repositories with independant checkins, I
think you'd have to script something up on your own to merge them.



HTH,
Rob


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: Strange behaviour with cvs rlog and branch tag

2003-08-14 Thread Olivier Imbrechts
At 11:07 13/08/2003 +0200, you wrote:


 OK, so may be I do not use the right command to get what I want.
 All I need is to list files that will be checkout if I use the specified
 tag (ie the list of files that will be displayed when I checkout but
 without actually checkout them). That's what I get if I use the cvs
rlog
 command with the simple tag. But how get the list of files of a tagged
 branch? Do I need to use another command?

 Thanks in advance
Maybe cvs -qn checkout -rBRANCH ?

--
Julien


It should work but I reveive the following error:
cvs [checkout aborted]: there is no version here; run 'cvs checkout' first
I searched google but found no solution with this problem

Olivier



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: How to determine the previous revision number?

2003-08-14 Thread Eric Siegerman
On Thu, Aug 07, 2003 at 06:42:43PM -0400, Dickson, Craig wrote:
 Or alternatively is there a known algorithm, that given a
 CVS revision number, can determine what the previous revision number was?

if the last component (the Z in 1.3.2.Z) is greater than 1
decrement it
else if there are more than two components
strip off the last two components
else
// there are exactly two components, X.1
this was the first revision; it has no predecessor

1.5 - 1.4 - 1.3 - 1.2 - 1.1
1.3.6.2.2.2 - 1.3.6.2.2.1 - 1.3.6.2 - 1.3.6.1 - 1.3 - 1.2 - 1.1

Notes:
  - For CVS, the first component is very likely to be 1; however,
it *can* have a different value (especially in ,v files
originally created with raw RCS)

  - If rev. 1.1.1.1 exists, it's a special case, with two
subcases:
  - 1.1.1.1 is usually identical to rev. 1.1; in this case,
consider 1.1.1.1 to be the first revision, and ignore 1.1
entirely.

This subcase arises when the ,v file was created by cvs
import.  That wants the first revision to be 1.1.1.1,
but the RCS file format doesn't allow that (you can't
have a branch with no root), so import creates rev. 1.1
simply as a root to which to anchor 1.1.1.1.

  - If 1.1.1.1 differs from 1.1, don't ignore either of them.
It's not clear what you *should* do here, since (the file
format's logic notwithstanding) it's possible that
neither rev. is really an ancestor of the other; they've
probably descended from a common ancestor that isn't
available in CVS!  (Kind of like humans and gorillas,
whose common ancestor is long extinct.)

This arises when the file was created locally via cvs
add; cvs commit, and someone subsequently did a cvs
import of that file.

Note that you can distinguish these two cases from the log
output, by looking at the +N -M indicators on 1.1.1.1, so
you don't have to cvs diff them.

--

|  | /\
|-_|/ Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED]
|  |  /
When I came back around from the dark side, there in front of me would
be the landing area where the crew was, and the Earth, all in the view
of my window. I couldn't help but think that there in front of me was
all of humanity, except me.
- Michael Collins, Apollo 11 Command Module Pilot



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Adding files on branch off a branch

2003-08-14 Thread Matthew Herrmann
Hi All,

If I create a new file on a branch of a branch, it creates a 3-digit branch
(ie 1.1.2), and not 5 digit ones like all the other files which were already
on the first branch and were then subsequently modified.

I think this is because the simple handling of newly created files just adds
a deleted revision 1.1 and then resurrects it on the branch.

My question is, when I then merge back onto my first-level branch, it will
try to resurrect the 1.1 file from the trunk, won't it? But that revision
number will already have been taken by the branch of the branch. So either
it will have to give it an unrelated number, which breaks the idea that
1.1.2.4.5.6 is always a descendent of 1.1.2.4, or it will clash on the
revision number of the existing branch and crash.

Am I on track here?

TIA,

Matthew Herrmann
--
VB6/SQL/Java/CVS Consultancy
Far Edge Technology
http://www.faredge.com.au/



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: problems with a CVS authentication

2003-08-14 Thread Mark D. Baushke
ssh-agent should be setting environment variables and creating a socket
for communication with ssh-add and ssh itself. If ssh-agent fails to get
the environment set up so that it may communicate with ssh-add, then
this is a problem you need to track down with the person who installed
your OpenSSH or with openssh folks themselves.

-- Mark

S.Magesh [EMAIL PROTECTED] writes:

 HI,
 
 Thanks for your reply ,
 
 But ssh-add commands gives output like this
 
 Could not open a connection to your authentication agent.
 
 Is there anythingh to start??
 
 I have started ssh-agent it started sucessfully.
 
 Pls help me to sort out this issue.
 
 S.Magesh
 
 Contentment brings happiness even in poverty. Discontent brings
 poverty, even in wealth.
 - Original Message -
 From: Mark D. Baushke [EMAIL PROTECTED]
 To: S.Magesh [EMAIL PROTECTED]
 Cc: [EMAIL PROTECTED]; Fabian Cenedese [EMAIL PROTECTED]
 Sent: Monday, August 11, 2003 1:18 PM
 Subject: Re: problems with a CVS authentication
 
 
  S.Magesh [EMAIL PROTECTED] writes:
 
   Iam using CVS Repository in RH 7.3 Linux server ,and i connect my server
   thru WINCVS via OpenSSH Authetication.
  
   My Problem is if i do any changes in my CVS it is asking password each
 and
   every time.
  
   How do i stop this , is theri any configuration to make ???
 
  You will want to investigate the ssh-agent command to be used
  in conjunction with the ssh-add command.
 
   After searching google i tried SSH_KEYGEN and created public and private
   keys and placed the public keys in the server( renamed to authorized
 _keys)
   but still the problem is not fixed.
 
  The name of the file is $HOME/.ssh/authorized_keys and/or
  $HOME/.ssh/authorized_keys2 (depending on the version of OpenSSH).
 
   Pls GURUS help us in solving this problem
 
  Enjoy!
  -- Mark
 
  Typical possibility:
 
  exec ssh-agent $SHELL
  ssh-add
  enter your pass phrase
 
  Now, assuming that the $HOME/.ssh/id_rsa.pub (or id_dsa.pub) file has
  been added to your $HOME/.ssh/authorized_keys2 file on the server, it
  should be possible to 'ssh server date' without entering your pass
  phrase.
 
  Enjoy!
  -- Mark
 


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: should we branch or tag every time we add a file?

2003-08-14 Thread Eric Siegerman
On Sun, Aug 10, 2003 at 11:58:09PM -0400, Larry Jones wrote:
 If you want to get a previous release, you either need to have a tag or
 you need to get it by date.  In either case, CVS won't include files
 from the future.

But if you want to change that previous release (to create a
patch release due to an urgent bug fix, for example), and commit
your changes, you need a branch.

(If you *don't* want to create patch releases, the branch won't
be used; but having it doesn't do any real harm; but it does
clutter up the repo with empty branches that you have to keep
track of, or at least remember to ignore in the cvs log
output.)

Thus, depending on your needs in the future, you might need
either a tag, or a branch, or both.

If you have a tag, though, it's easy to create a branch based on
that tag, but it's difficult to go the other way.

A good approach can be to create only a tag, for now.  If you
later need to patch the release, you can create a branch at that
time to hold your changes.  In the meantime, you've avoided
cluttering up your repo with unnecessary branches.

--

|  | /\
|-_|/ Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED]
|  |  /
When I came back around from the dark side, there in front of me would
be the landing area where the crew was, and the Earth, all in the view
of my window. I couldn't help but think that there in front of me was
all of humanity, except me.
- Michael Collins, Apollo 11 Command Module Pilot



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: detect a merge

2003-08-14 Thread Larry Jones
Pedro Salazar writes:
 
 I made some merges in my project module but I didn't log with a suitable
 message on it saying that it was a merge from a specific branch in a
 specific revision. Can CVS track if specific revision was created by a
 merge from a branch? Or how could I know that?

CVS doesn't track merges.  If you want to know about them, it's up to
you to track them (typically via log messages and/or tags).

-Larry Jones

Oh yeah?  You just wait! -- Calvin


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: revision macro

2003-08-14 Thread KK



Is it possible to add our own macro to the 
existing.Say for ex.my requirement is,
file should contain the name of the person who 
modified it recently(this person may be different from the one who created the 
file) along with the file creator.

Thank You very much

Regards
Krishna
- Original Message - 

  From: 
  Erik Andersson 
  To: KK ; [EMAIL PROTECTED] 
  Sent: Wednesday, August 06, 2003 1:59 
  PM
  Subject: RE: revision macro
  
  Hi!
  
  Maybe this is what you are looking for? http://www.durak.org/cvswebsites/doc/cvs_99.php
  
  Regards / Erik Andersson
  
-Original Message-From: KK 
[mailto:[EMAIL PROTECTED]Sent: den 6 augusti 2003 
09:13To: [EMAIL PROTECTED]Subject: 
revision macro
Hi all
how to and where to set a macro so that 
the revision of the file appears inside the file.
where can I get this information?

Thanks in advance

Regards
Krishna


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: should we branch or tag every time we add a file?

2003-08-14 Thread Larry Jones
Pedro Salazar writes:
 
 On specific time in my main branch, I decided to add a new file. Before
 I add the new file to the main branch, should I tag with a symbolic name
 or should I create a new branch where should exist the file?

That's entirely up to you.

 For instance, if I don't add a new branch, I'll have to tag my module to
 a reference without that file. Suppose if I want to get a previous
 release where the new file has not been added I must have a tag or a
 branch to avoid get all the files if some are from future revisions...

If you want to get a previous release, you either need to have a tag or
you need to get it by date.  In either case, CVS won't include files
from the future.

-Larry Jones

I sure wish I could get my hands on some REAL dynamite. -- Calvin


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


CVSWeb(NT) problem on Win2K

2003-08-14 Thread Ralph Jocham
Hi,
I am not sure if this is the right mailing list but I
have the following problem.
I installed CVSWebNT on my Win2K Server and after some
playing around it did work. Now, suddenly out of the
blue it does not work any more. The error message is
the following (rlog is on the sys path)

Error: Failed to spawn GNU rlog on
'E:/CVSRepo/demo/source//aREADME.txt,v,
E:/CVSRepo/demo/source//build.xml,v,

I have noticed the // just before the file and removed
it to a single / -- no success -- then I replaced the
/ with a \ -- no success. The rlog command being run
in cvswebnt.cgi is the follwoing:

open($fh, rlog \ . $filenames . \ 2nul |)  

but when I type same command on the cmd line :

C:\rlog e:\cvsrepo\sds\dev\archiver.log4j,v
rlog: e:\cvsrepo\sds\dev\RCS/archiver.log4j,v: No such
file or directory

I see a RCS folder being put in to the string? Why? Is
this the cause??


Thanks,
Ralph

__
Do you Yahoo!?
Yahoo! SiteBuilder - Free, easy-to-use web site design software
http://sitebuilder.yahoo.com


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Using loginfo to mail commit notifications via PC and UNIX

2003-08-14 Thread Nicholas, George
Title: Using loginfo to mail commit notifications via PC and UNIX






I edited the loginfo file to enable notification
of commits via Unix but users of WinCVS don't
trigger email notifications.


Does anyone have a script that works for both
Unix CVS and WinCVS.


George



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Repository design suggestions

2003-08-14 Thread Martyn Klassen
I'm trying to design the repository structure for a group of projects under 
team development and was wondering if anyone with more experience might have 
some recommendations for an efficient design.

The projects are extensions to a commercial application and consist largely 
of text files (macros, menus, c-code, etc.). To be useful, tested/debugged, 
the project files have to be in the directories dictated by the application. 
Initial I thought this wouldn't be a problem, you simply make the repository 
tree structure the same as that used by the application and check out a 
working copy on top of the directories used by the application. Of course 
releasing the project becomes difficult because cvs release -d is not 
smart enough to only delete files under cvs control, but more problematic is 
the issue of when you need two or more projects checked out at the same 
time. CVS will not allow you to check out files from two trees in the 
repository to the same working directory. You could put all the projects 
into one tree in the repository and use the module definition to check out 
different groups, however when you have 100+ files in a group it gets 
tedious to define and maintain the module definitions, and seems apt to 
cause many problems. The only other idea I could come up with was to have 
separate trees for each project in the repository and use install and 
uninstall scripts to create and destory links in the application directory, 
but the application has the annoying tendency to break links when it 
modifies a file making this less than ideal.

I'd appreciate any insights on possible design solutions that others have 
found to work.

Martyn

_
MSN 8 helps eliminate e-mail viruses. Get 2 months FREE*.  
http://join.msn.com/?page=features/virus



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Newbie: problems adding directory to repository

2003-08-14 Thread Jesse Sheidlower

I've recently started using CVS to help manage a programming
project that I, and I alone, am working on, at least for
now. I'm having a problem and couldn't find a solution in the
docs or in the archives.

My setup is that I have my CVS repository on my working server,
and then a sandbox on my working server from which a build 
script puts things where they're supposed to go. Then on my
development server, I again have a sandbox and a build script.
I've been working by making changes in the sandbox on the dev
sever, and when they're ready, committing them to the repository,
updating the working server's sandbox, and building it out.

There was a point at which I was making a lot of changes to my
dev sandbox, but didn't have access to the repository so
couldn't commit anything. When I got back to it, I found that
I couldn't get some things to match up.

The basic problem is that I had taken a specific program, and
directory, called Book.pm and Book/ and then generalized it
and renamed them to MyDatabase.pm and MyDatabase/ . In my dev
sandbox, I have this directory called MyDatabase/ and there
are a bunch of programs underneath it that used to be in Book/ . 
But I can't seem to get this directory onto the working
server. When I go to the working sandbox and type cvs
update, it doesn't create MyDirectory/ or anything underneath
it; it's the same when I deleted the entire sandbox and did a
cvs checkout from scratch.

Yet in the development sandbox, it certainly thinks it's there--
when I type cvs add MyDatabase/ or cvs add [any of the programs
under MyDatabase/] I get messages like there is a version
in MyDatabase already or SearchView.pm already exists, with
version number 1.3.

What do I need to do to get these files out of CVS and into
the sandbox on the working server?

Thanks very much. Sorry if I'm missing something obvious.

Jesse Sheidlower
[EMAIL PROTECTED]


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


problems with a unicode file

2003-08-14 Thread Tiziana Biondo



Hi All,

I am using WinCvs 1.3 . I added to my repository a 
pdf file with the 'addunicode' optionsince the system warned me when 
I tried to use 'add binary'. When I checked it out Icouldn't open it 
because itresults corrupted, so I'vedeleted the file and added 
it once again forcing WinCvs to use the binary mode. The problem is that the 
system keeps on adding it as a unicode( -ku option) making it impossible 
for me toopen that document. 
To resolve this situation, do I have to physically 
delete the file from the server? And if sowhichis the right way to 
do it (I mean do I have to look in the Attic or whatever...)?

Thanks in advance

Tiziana Biondo

___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: how to really remove the information of the file?

2003-08-14 Thread david
 When you remove a file from the repository you actually mark it as dead, 
and it stays in the repository.. Therefore the upcount in revision numbers.

Yes.  CVS has no way to distinguish between two different files with the
same names and the same location in the directory structure.
  
 I think the way to permanently delete a file is to to it hard and without 
using cvs-commands (in Unix use rm) That is if you are clear with that the 
file and all previous revisions will forever be gone. You also have to have 
access to removing files from the cvsroot. 

Right.  If you go to the repository and delete the file there
corresponding to the offending file but having ,v appended to the
end, it's gone forever.

This is something to be very careful of.  By doing that, you break the
repository for any time before the file was marked dead or removed,
and you lose that file permanently.  This is normally exactly what
you don't want in a version control system.

And what you get by this is a different revision number.  This doesn't
matter.  You cannot map revision numbers to much of anything else
successfully without putting in a lot of pointless work, and so you
are almost always much better off treating the revision numbers
as magic cookies.

When you want to have a coherent setup of the file system that you can
refer to later, use tags.  That's what they're there for.

Revision numbers are for CVS.
Tags are for humans.

-- 
Now building a CVS reference site at http://www.thornleyware.com
[EMAIL PROTECTED]



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


permissions on modules

2003-08-14 Thread sbrown
Let's say I have in my repository, two modules:  client1_module,
client2_module.

I only want my internal folks to view, commit, update, etc from
client1_module.  However, I want to be able to give an employee of my
client2 access to and abilitity to commit, update, etc anything in
client2_module.

Right now, all of the files in the whole repository are owned by cvs.cvs. 
I have added all of my developers to the cvs group.  All is well.  Now,
how can I give my client2 access to ONLY her module?  I don't care if she
can see that there is another module, but I don't wan't her to be able to
view the files in, or do any updates, commits, etc on the client1 module. 
Is this possible?

Thanks.


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


RE: Info-cvs Digest, Vol 9, Issue 4

2003-08-14 Thread Matthew Herrmann
Hi Gu,

These are intermediate files used by C++ to make builds quicker that you
don't need to keep in CVS. You're better off adding them to your .cvsignore
file instead.

HTH,

Matthew Herrmann
--
VB6/SQL/Java/CVS Consultancy
Far Edge Technology
http://www.faredge.com.au/


-Original Message-

Message: 3
Date: Mon, 4 Aug 2003 21:52:41 -0400
From: Mark Priest [EMAIL PROTECTED]
Subject: Re: file changed in cvs-1.11.5 on win2k
To: Gu Shaodong [EMAIL PROTECTED],  [EMAIL PROTECTED]
Message-ID: [EMAIL PROTECTED]
Content-Type: text/plain;   charset=gb2312

Gu,

I believe these are all binary files.  You should have added them to cvs
with cvs add -kb so that keyword expansion was turned off and the file was
recognized as  binary.  By default cvs assumes file are text and attempts to
expand keywords such as $Author$, $Revision$, etc.  It also assumes files
can be stored in the repository using RCS format which includes the current
version plus all of the deltas in the same file.  You can fix this by
running the admin command against a correct version of the files (i.e. cvs
admin -kb foo.pdb) or by removing them and adding them again using (rm
foo.pdb, cvs remove foo.pdb, then cvs add -kb foo.pdb).

-Mark

- Original Message -
From: Gu Shaodong [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Monday, August 04, 2003 9:14 PM
Subject: file changed in cvs-1.11.5 on win2k


 Hi, guys:

 I'm not sure whether my question has been asked for many times or not.
 If so, please tell me where I can find the solution. Thanks.

 I got a problem when using cvs-1.11.5 on win2k sp4.
 After importing a vc6 workspace including several projects into cvs,
 some file changed when I check out this tree later.
 changed file: some .pdb, .ico, .bmp (maybe some other files I didn't
 find out)
 Any help or advice ?

 TIA
 -gusd




 ___
 Info-cvs mailing list
 [EMAIL PROTECTED]
 http://mail.gnu.org/mailman/listinfo/info-cvs



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


revision macro

2003-08-14 Thread KK



Hi all
how to and where to set a macro so that the 
revision of the file appears inside the file.
where can I get this information?

Thanks in advance

Regards
Krishna


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


RE: detect a merge

2003-08-14 Thread Dickson, Craig
Title: RE: detect a merge





Yes the expressions are configurable. Look in your cvsgraph.conf file.


-Original Message-
From: William Deegan([EMAIL PROTECTED] consultant) [mailto:[EMAIL PROTECTED]]
Sent: Monday, August 11, 2003 11:27 AM
To: Dickson, Craig
Cc: [EMAIL PROTECTED]
Subject: Re: detect a merge



Dickson, Craig wrote:
 CvsGraph v1.4.0 has the ability to graphically show merges if you tag 
 the branch and then the trunk (or other branch) after the merge with tag 
 names that match particular regular expressions.
Are these regular expressions configurable?
If not what are the patterns to match?


Thanks,
Bill



 
 -Original Message-
 From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
 Sent: Sunday, August 10, 2003 8:56 PM
 To: [EMAIL PROTECTED]
 Cc: [EMAIL PROTECTED]
 Subject: Re: detect a merge
 
 
 Pedro Salazar writes:
 
  I made some merges in my project module but I didn't log with a suitable
  message on it saying that it was a merge from a specific branch in a
  specific revision. Can CVS track if specific revision was created by a
  merge from a branch? Or how could I know that?
 
 CVS doesn't track merges. If you want to know about them, it's up to
 you to track them (typically via log messages and/or tags).
 
 -Larry Jones
 
 Oh yeah? You just wait! -- Calvin
 
 
 ___
 Info-cvs mailing list
 [EMAIL PROTECTED]
 http://mail.gnu.org/mailman/listinfo/info-cvs
 



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


RE: tools for deleting the expanded $Log$ comments

2003-08-14 Thread Zieg, Mark
 Thanks for your code, I have tested we the example file I am sending to you,
 but it prints me the followin message: No RCS-formatted logs were found! I
 don't know why because I have such logs comments.

It's because your log comments are in this form:

 begin snip 
//Source file: I:\\isf\\util\\DynamicInstance.java

/* CmIdentification

// Version History:
$Log: DynamicInstance.java,v $
Revision 1.5  2003/07/28 16:18:08  UF367151
Extension to the isf.util package, to be included on the kernel of SGCv10. Utility 
classes.



 */
 end snip 

My script was written for cases where the $Log$ tag is NOT flush left, but rather has 
some sort of character prefix to the left of the tag.  This is a sufficiently standard 
condition that RCS was designed to detect and re-insert those prefixes before every 
revision comment line.  That is, my script was designed to work for cases like this:

/*
 * Author:   $Author$
 * Revision: $Revision$
 * History:
 *   $Log$
 *   Revision 1.5  2003/07/28 16:18:08  UF36715
 *   Extension to the isf.util package, to be included 
 *   on the kernel of SGCv10. Utility classes.
 */

or this:

// Author:   $Author$
// Revision: $Revision$
// History:
//   $Log$
//   Revision 1.5  2003/07/28 16:18:08  UF36715
//   Extension to the isf.util package, to be included 
//   on the kernel of SGCv10. Utility classes.

...or something along those lines.

See, there needs to be some way of telling when the $Log$ comments STOP.  Given the 
variety of coding conventions in use, it's impossible to come up with a standard, 
failsafe way to do that.

If you want to pursue this, and if the Java source you sent was representative of your 
entire body of code, then try changing the middle block of the script from this:

elsif( $State eq IN_LOG )
{
if( $Line =~ /^$Prefix/ )
{
# looks like a follow-on log line;
# do nothing, and thus delete line
}
else
{
# looks like the prefix has changed, so
# assUme we've ended the log section
print $Line;
$State = AFTER_LOG;
}
}

...to this:

elsif( $State eq IN_LOG )
{
if( $Line =~ /^\/\/+/ )
{
# looks like we hit one of those //... 
# separators, so assUme we've ended the log section
print $Line;
$State = AFTER_LOG;
}
}

Beyond that, you need to find someone on your end who can help you with automated text 
processing (or order a used copy of this 
http://www.amazon.com/exec/obidos/asin/1565924622).  This has ceased to be a CVS 
discussion.


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: Adding files on branch off a branch

2003-08-14 Thread Max Bowsher
Matthew Herrmann wrote:
 Hi All,

 If I create a new file on a branch of a branch, it creates a 3-digit
 branch (ie 1.1.2), and not 5 digit ones like all the other files which
 were already on the first branch and were then subsequently modified.

 I think this is because the simple handling of newly created files just
 adds a deleted revision 1.1 and then resurrects it on the branch.

 My question is, when I then merge back onto my first-level branch, it will
 try to resurrect the 1.1 file from the trunk, won't it? But that revision
 number will already have been taken by the branch of the branch. So either
 it will have to give it an unrelated number, which breaks the idea that
 1.1.2.4.5.6 is always a descendent of 1.1.2.4, or it will clash on the
 revision number of the existing branch and crash.

The new revision on the first level branch will be 1.1.4.1

Max.



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Any working informational links to convert PVCS to CVS please,thank you !

2003-08-14 Thread AdabalaP


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: Newbie: problems adding directory to repository

2003-08-14 Thread Julien Wajsberg

You have to use cvs update -dP on your server sandbox to create new
directories and delete empty one in a workign directory.

For your other problem I don't know sorry :)

--
Julien






I've recently started using CVS to help manage a programming
project that I, and I alone, am working on, at least for
now. I'm having a problem and couldn't find a solution in the
docs or in the archives.

My setup is that I have my CVS repository on my working server,
and then a sandbox on my working server from which a build
script puts things where they're supposed to go. Then on my
development server, I again have a sandbox and a build script.
I've been working by making changes in the sandbox on the dev
sever, and when they're ready, committing them to the repository,
updating the working server's sandbox, and building it out.

There was a point at which I was making a lot of changes to my
dev sandbox, but didn't have access to the repository so
couldn't commit anything. When I got back to it, I found that
I couldn't get some things to match up.

The basic problem is that I had taken a specific program, and
directory, called Book.pm and Book/ and then generalized it
and renamed them to MyDatabase.pm and MyDatabase/ . In my dev
sandbox, I have this directory called MyDatabase/ and there
are a bunch of programs underneath it that used to be in Book/ .
But I can't seem to get this directory onto the working
server. When I go to the working sandbox and type cvs
update, it doesn't create MyDirectory/ or anything underneath
it; it's the same when I deleted the entire sandbox and did a
cvs checkout from scratch.

Yet in the development sandbox, it certainly thinks it's there--
when I type cvs add MyDatabase/ or cvs add [any of the programs
under MyDatabase/] I get messages like there is a version
in MyDatabase already or SearchView.pm already exists, with
version number 1.3.

What do I need to do to get these files out of CVS and into
the sandbox on the working server?

Thanks very much. Sorry if I'm missing something obvious.

Jesse Sheidlower
[EMAIL PROTECTED]


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs






___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: going back to the trunk on update

2003-08-14 Thread Mark D. Baushke
Ronald Petty [EMAIL PROTECTED] writes:

 I did cvs update -r bra-1_0 file

 Now my file is on the branch.  However I want to change it back to being
 the trunk, just the latest trunk version.  
 
 I know I can look in the repository for the head version number but is
 there an easier way?

cvs update -A file

-- Mark


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: Comparing fileversions with tagged version

2003-08-14 Thread Larry Jones
Vikas  K writes:

 I want to know what all file in a particular version are not 
 latest.

cvs rdiff -s -rtag module

-Larry Jones

In my opinion, we don't devote nearly enough scientific research
to finding a cure for jerks. -- Calvin


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


going back to the trunk on update

2003-08-14 Thread Ronald Petty
Hi,
I did cvs update -r bra-1_0 file

Now my file is on the branch.  However I want to change it back to being
the trunk, just the latest trunk version.  

I know I can look in the repository for the head version number but is
there an easier way?

Thanks in advance 
Ron



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


tools for deleting the expanded $Log$ comments

2003-08-14 Thread David
Hello members,

I would like to know if there is a tools (in perl for example) that delete
all the $Log$ expanded comments. Sometimes it is usefull because your
classes have revisions for a given project, but if you decide to eliminate
from all your code the inserted log comments for a given new revision, or
because your are using your class on another project.

Do you have any suggestion about how to handle such situation. For example I
would like to replace the expanded comments by $Log$, becase I wanto to use
such source files on another project.

Thanks in advance,

David



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


CVS commit and breaking lock

2003-08-14 Thread Loïc Bertholet



Hi,

Onthe HEAD, when a locked resource is 
commited, the lock is lost.

If branches are made, and user puts several locks 
on head and branches, what is the normal behaviour of commit (on head or on 
branch) ?

I try different case and results were not the same. 
Sometimes, lock is only lost on commited revision but most of the time all the 
locks are lost... is this normal ?

thanks,

Loïc
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: Strange behaviour with cvs rlog and branch tag

2003-08-14 Thread Olivier Imbrechts
At 11:36 12/08/2003 -0400, you wrote:
Olivier Imbrechts writes:

 When listing files tagged with a branch tag I only get directories 
while it
 works fine with simple tag.
 Am I missing something or is it a bug?

There aren't any revisions actually on the branch yet (the root is not
on the branch), which is why you're not getting any results.  I don't
think that's a bug, but it might be possible to convince me otherwise.
OK, so may be I do not use the right command to get what I want.
All I need is to list files that will be checkout if I use the specified 
tag (ie the list of files that will be displayed when I checkout but 
without actually checkout them). That's what I get if I use the cvs rlog 
command with the simple tag. But how get the list of files of a tagged 
branch? Do I need to use another command?

Thanks in advance

Olivier



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: Repository design suggestions

2003-08-14 Thread Mark Priest
Martyn,

I have not done anything like this myself but I think some of the
information in Chapter 7, System Administration with CVS, from Open Source
Development with CVS by Karl Fogel and Moshe Bar might be helpful to you.
A free version of the book under the GPL license can be downloaded from
http://cvsbook.red-bean.com/.

-Mark

- Original Message -
From: Martyn Klassen [EMAIL PROTECTED]
To: [EMAIL PROTECTED]
Sent: Friday, August 08, 2003 5:00 PM
Subject: Repository design suggestions


 I'm trying to design the repository structure for a group of projects
under
 team development and was wondering if anyone with more experience might
have
 some recommendations for an efficient design.

 The projects are extensions to a commercial application and consist
largely
 of text files (macros, menus, c-code, etc.). To be useful,
tested/debugged,
 the project files have to be in the directories dictated by the
application.
 Initial I thought this wouldn't be a problem, you simply make the
repository
 tree structure the same as that used by the application and check out a
 working copy on top of the directories used by the application. Of course
 releasing the project becomes difficult because cvs release -d is not
 smart enough to only delete files under cvs control, but more problematic
is
 the issue of when you need two or more projects checked out at the same
 time. CVS will not allow you to check out files from two trees in the
 repository to the same working directory. You could put all the projects
 into one tree in the repository and use the module definition to check out
 different groups, however when you have 100+ files in a group it gets
 tedious to define and maintain the module definitions, and seems apt to
 cause many problems. The only other idea I could come up with was to have
 separate trees for each project in the repository and use install and
 uninstall scripts to create and destory links in the application
directory,
 but the application has the annoying tendency to break links when it
 modifies a file making this less than ideal.

 I'd appreciate any insights on possible design solutions that others have
 found to work.

 Martyn

 _
 MSN 8 helps eliminate e-mail viruses. Get 2 months FREE*.
 http://join.msn.com/?page=features/virus



 ___
 Info-cvs mailing list
 [EMAIL PROTECTED]
 http://mail.gnu.org/mailman/listinfo/info-cvs




___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: how to really remove the information of the file?

2003-08-14 Thread Mark Priest
Just to clarify what Erik was saying you must remove the RCS file in the
repository (in addition to the file in your working directory) in order to
erase cvs's memory of that file.  When you use cvs remove the RCS file is
moved to a subdirectory of its original location named Attic so you should
look for it there.

-Mark

- Original Message -
From: Erik Andersson [EMAIL PROTECTED]
To: David [EMAIL PROTECTED]; Info-Cvs [EMAIL PROTECTED]
Sent: Thursday, August 07, 2003 7:49 AM
Subject: RE: how to really remove the information of the file?


When you remove a file from the repository you actually mark it as dead, and
it stays in the repository.. Therefore the upcount in revision numbers.

I think the way to permanently delete a file is to to it hard and without
using cvs-commands (in Unix use rm) That is if you are clear with that the
file and all previous revisions will forever be gone. You also have to have
access to removing files from the cvsroot.

Hope this information is correct ;-)

Regards / Erik Andersson

-Original Message-
From: David [mailto:[EMAIL PROTECTED]
Sent: den 7 augusti 2003 11:56
To: Info-Cvs
Subject: how to really remove the information of the file?


Dear members,

When I remove a file from the repository, the file doesn't exist any more,
but, If I want to add a file with the same name, the revision number is not
1.1, it takes in to account that this file was previously removed, so the
revsion number is 1.2. Is there any way to avoid this behavour?

Thanks in advance,

David

  _


David Leal Valmaña


Tel

91 210 33 00 ext. 71 923


Fax

91 597 05 62


e-mail

 mailto:[EMAIL PROTECTED] [EMAIL PROTECTED]


 http://www.soluziona.es/ Soluziona,  http://www.unionfenosa.es/ Grupo
Unión Fenosa

Calle Pedro Texeira 8 2da Planta. Madrid 28020












 ___
 Info-cvs mailing list
 [EMAIL PROTECTED]
 http://mail.gnu.org/mailman/listinfo/info-cvs





___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


RE: tools for deleting the expanded $Log$ comments

2003-08-14 Thread David
Zieg,

Thanks for your code, I have tested we the example file I am sending to you,
but it prints me the followin message: No RCS-formatted logs were found! I
don't know why because I have such logs comments.

I have tested it under:

This is perl, v5.6.1 built for MSWin32-x86-multi-thread
(with 1 registered patch, see perl -V for more detail)

Copyright 1987-2001, Larry Wall

Binary build 631 provided by ActiveState Tool Corp.
http://www.ActiveState.com
Built 17:16:22 Jan  2 2002

Thanks in advance for any help,

David


-Mensaje original-
De: Zieg, Mark [mailto:[EMAIL PROTECTED]
Enviado el: miércoles, 06 de agosto de 2003 15:08
Para: David; Info-Cvs
Asunto: RE: tools for deleting the expanded $Log$ comments


 I would like to know if there is a tools (in perl for example)
 that delete all the $Log$ expanded comments. Sometimes it is
 useful because your classes have revisions for a given project,
 but if you decide to eliminate from all your code the inserted
 log comments for a given new revision, or because your are using
 your class on another project.

Yuck...but I've been there.  It's an ugly situation, but sometimes
management comes up with pretty ugly mandates.

You may need to tweak this to work on your coding/comment conventions, but
it worked on a bit of C code I ran it against:

#!/usr/bin/perl -w


#
#
#   StripRcsLog.pl
#
#
#


#
#
#  Description:Attempts to strip RCS/CVS-inserted $Log$ comments from
a  #
#  text file.
#
#
#
#  Author: Mark Zieg [EMAIL PROTECTED]
#
#
#
#  Usage:  StripRcsLog.pl  commented.c  stripped.c
#
#
#
#  WARNING:THIS IS DANGEROUS.  The algorithm is not foolproof.
#
#  Manual verification of cleaned code is highly
recommended!  #
#  (Of course, you'd only be using this script if you kept
#
#  all your code under revision-control...:-)
#
#
#



MAIN:
{
my $State = BEFORE_LOG;
my $Prefix;
while( my $Line = STDIN )
{
if( $State eq BEFORE_LOG )
{
if( $Line =~ /^(.*)\$Log.*\$/ )
{
$State = IN_LOG;
$Prefix = $1;
$Prefix =~ s/\*/\\*/g;  # If you understand the need for
this,
}   # you get your Perl badge for the
day!
else
{
print $Line;
}
}
elsif( $State eq IN_LOG )
{
if( $Line =~ /^$Prefix/ )
{
# looks like a follow-on log line;
# do nothing, and thus delete line
}
else
{
# looks like the prefix has changed, so
# assUme we've ended the log section
print $Line;
$State = AFTER_LOG;
}
}
elsif( $State eq AFTER_LOG )
{
print $Line;
}
else
{
die( Invalid state: $State\n );
}
}
if( $State eq BEFORE_LOG )
{
warn( No RCS-formatted logs were found! );
}
elsif( $State eq IN_LOG )
{
warn( The log parser consumed the entire file!  Probable script
error! );
}
}


DynamicInstance.java
Description: Binary data
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: Any working informational links to convert PVCS to CVS please,thank you !

2003-08-14 Thread Mark D. Baushke
There is a pvcs2rcs script in the contrib directory of any recent cvs
source distribution. See also the thread:

http://mail.gnu.org/archive/html/info-cvs/2003-03/msg00248.html

Older threads also exist...

http://mail.gnu.org/archive/html/info-cvs/2001-08/msg00722.html

As well as talking about converting MS Visual SourceSafe to CVS format:

http://mail.gnu.org/archive/html/info-cvs/2001-02/msg00038.html
http://www.laine.org/cvs/vss2cvs

Or converting from MS Visual SourceSafe into RCS format:
http://www.hagenlocher.org/software/vss2rcs.js

Good luck,
-- Mark


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: Howto?

2003-08-14 Thread Franky Van Liedekerke
On 14 Aug 2003 16:11:01 +0300
Stephen Biggs [EMAIL PROTECTED] wrote:

 1. Rename a module in the repository? Is it even possible? That way,
 the next time somebody checks out the entire module, the directory
 name will have the change?

Just rename the dir in the repository, or play around with the modules
file to create an alias for this module.
 
 2. If I checkout a module from one repository, say from the Internet,
 and then import it into a second repository, say my local one, is
 there an easy and correct way to make sure that the local copy is also
 updated by the changes in the remote repository?  That is, I want to
 do an update from the remote repository in my local directory and then
 be able to merge and commit those changes to my local repository?

I can't imagine this to work without any scripting, and even then ...
I'm also interested in any solutions for this though ...

Franky


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


CVS - Razor conversion

2003-08-14 Thread Zieg, Mark
Has anyone ever written a script to migrate a CVS repository to Razor 
(http://www.visible.com/Products/Razor)?  I'm hashing one out in Perl, just wondering 
if anyone else has ever walked this path.

(This post does not constitute an endorsement of Razor or a suggestion that it is a 
recommended alternative to CVS! :-)

-Mark Zieg


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


ClearCase - CVS

2003-08-14 Thread Dickson, Craig



My company currently 
has code in VSS, ClearCase and CVS - for various historical reasons. We are 
migrating towards a pure CVS solution. I have migrated the VSS code across quite 
easily using the vss-to-cvs.pl script.

I did a quick search 
on Google for ClearCase to CVS migration utilities but didn't see anything that 
looked very promising. For example there there were a few posts regarding a tool 
called "clearexport_ccase", but that looked like it required a fair bit of 
scripting work around it to make it do a full migration.

Anyone have any 
other suggestions?

Thanks.
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Howto?

2003-08-14 Thread Stephen Biggs
1. Rename a module in the repository? Is it even possible? That way, the
next time somebody checks out the entire module, the directory name will
have the change?

2. If I checkout a module from one repository, say from the Internet,
and then import it into a second repository, say my local one, is there
an easy and correct way to make sure that the local copy is also updated
by the changes in the remote repository?  That is, I want to do an
update from the remote repository in my local directory and then be able
to merge and commit those changes to my local repository?

Thanks for any help.





___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: cvs server socket error

2003-08-14 Thread Mahantesh
Harmit Singh wrote:

I have a CVS server(running on RH 8.0 intel platform) whcih has started
giving me the error
cvs [commit aborted]: writing to server socket: error -1.
How can I stop this error put it back to normal operation.
http://www.mail-archive.com/[EMAIL PROTECTED]/msg15165.html

Mahantesh
--


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


cvs server socket error

2003-08-14 Thread Harmit Singh
Hi
I have a CVS server(running on RH 8.0 intel platform) whcih has started
giving me the error

cvs [commit aborted]: writing to server socket: error -1.
How can I stop this error put it back to normal operation.
TIA
Harmit






___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: Strange behaviour with cvs rlog and branch tag

2003-08-14 Thread Larry Jones
Olivier Imbrechts writes:
 
 When listing files tagged with a branch tag I only get directories while it 
 works fine with simple tag.
 Am I missing something or is it a bug?

There aren't any revisions actually on the branch yet (the root is not
on the branch), which is why you're not getting any results.  I don't
think that's a bug, but it might be possible to convince me otherwise.

-Larry Jones

From now on, I'm devoting myself to the cultivation of
interpersonal relationships. -- Calvin


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


cvswrappers question

2003-08-14 Thread Dickson, Craig



If I specify 
something like:

*.abc -k 
'b'

in my cvswrappers 
file, will this also match a file called example.ABC, or 
example.Abc?
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: Newbie: problems adding directory to repository

2003-08-14 Thread Stephen Biggs
Delete the CVS directory under MyDatabase in your local copy, re-add
it and re-add the files under it, commit, and you should be fine.  I
just had this same problem.

On Thu, 2003-08-14 at 16:55, Jesse Sheidlower wrote:
 
 I've recently started using CVS to help manage a programming
 project that I, and I alone, am working on, at least for
 now. I'm having a problem and couldn't find a solution in the
 docs or in the archives.
 
 My setup is that I have my CVS repository on my working server,
 and then a sandbox on my working server from which a build 
 script puts things where they're supposed to go. Then on my
 development server, I again have a sandbox and a build script.
 I've been working by making changes in the sandbox on the dev
 sever, and when they're ready, committing them to the repository,
 updating the working server's sandbox, and building it out.
 
 There was a point at which I was making a lot of changes to my
 dev sandbox, but didn't have access to the repository so
 couldn't commit anything. When I got back to it, I found that
 I couldn't get some things to match up.
 
 The basic problem is that I had taken a specific program, and
 directory, called Book.pm and Book/ and then generalized it
 and renamed them to MyDatabase.pm and MyDatabase/ . In my dev
 sandbox, I have this directory called MyDatabase/ and there
 are a bunch of programs underneath it that used to be in Book/ . 
 But I can't seem to get this directory onto the working
 server. When I go to the working sandbox and type cvs
 update, it doesn't create MyDirectory/ or anything underneath
 it; it's the same when I deleted the entire sandbox and did a
 cvs checkout from scratch.
 
 Yet in the development sandbox, it certainly thinks it's there--
 when I type cvs add MyDatabase/ or cvs add [any of the programs
 under MyDatabase/] I get messages like there is a version
 in MyDatabase already or SearchView.pm already exists, with
 version number 1.3.
 
 What do I need to do to get these files out of CVS and into
 the sandbox on the working server?
 
 Thanks very much. Sorry if I'm missing something obvious.
 
 Jesse Sheidlower
 [EMAIL PROTECTED]
 
 
 ___
 Info-cvs mailing list
 [EMAIL PROTECTED]
 http://mail.gnu.org/mailman/listinfo/info-cvs
 




___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


How to tag by date on a branch with rtag?

2003-08-14 Thread Dickson, Craig
Title: How to tag by date on a branch with rtag?





Is there a way to tag files on a branch based on a date using rtag? The script I am writing won't have access to a working copy of the branch.

I tried something like:
 cvs rtag -D date -r branch tag module


But I got an error which impled that I can either have a -D or a -r option, but not both.


Any ideas?


Thanks.



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


RE: How to tag by date on a branch with rtag?

2003-08-14 Thread Dickson, Craig
Title: How to tag by date on a branch with rtag?



Sorry, 
I found it in the archives.

-Original Message-From: Dickson, Craig 
[mailto:[EMAIL PROTECTED]Sent: Thursday, August 14, 2003 2:46 
PMTo: CVS List (E-mail)Subject: How to tag by date on a 
branch with rtag?
Is there a way to tag files on a branch based on a date using 
rtag? The script I am writing won't have access to a working copy of the 
branch.
I tried something like:  cvs rtag -D date -r branch tag 
module 
But I got an error which impled that I can either have a -D or a 
-r option, but not both. 
Any ideas? 
Thanks. 
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: Any working informational links to convert PVCS to CVS please,thank you !

2003-08-14 Thread Mark D. Baushke
Mark D. Baushke [EMAIL PROTECTED] writes:

 There is a pvcs2rcs script in the contrib directory of any recent cvs
 source distribution. See also the thread:
 
 http://mail.gnu.org/archive/html/info-cvs/2003-03/msg00248.html
 
 Older threads also exist...
 
 http://mail.gnu.org/archive/html/info-cvs/2001-08/msg00722.html
 
 As well as talking about converting MS Visual SourceSafe to CVS format:
 
 http://mail.gnu.org/archive/html/info-cvs/2001-02/msg00038.html
 http://www.laine.org/cvs/vss2cvs

I have been given a minor correction to my posting. Apparently this URL:

   http://www.laine.org:8080/cvs/vss2cvs

is better than the one without the port number. 

Both seemed to work for me, but your mileage may vary.

Good luck,
-- Mark
 
 Or converting from MS Visual SourceSafe into RCS format:
 http://www.hagenlocher.org/software/vss2rcs.js


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Comparing fileversions with tagged version

2003-08-14 Thread Vikas K
Hi,

I want to compare if the latest file versions in repository with 
the files in tagged version.
Suppose I have latest version for file 'X' as 1.6 in repository 
and my tagged versions 'app-id-1' has file 'X' of revision 1.4.
So there is diff in latest file version and tagged version.Is 
there some way in CVS wherein I can find the difference for my 
whole module.
I want to know what all file in a particular version are not 
latest.

Thanks in advance

___
Meet your old school or college friends from
1 Million + database...
Click here to reunite www.batchmates.com/rediff.asp


___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: Strange behaviour with cvs rlog and branch tag

2003-08-14 Thread Eric Siegerman
On Tue, Aug 12, 2003 at 11:36:42AM -0400, Larry Jones wrote:
 Olivier Imbrechts writes:
  When listing files tagged with a branch tag I only get directories while it 
  works fine with simple tag.
 
 There aren't any revisions actually on the branch yet (the root is not
 on the branch), which is why you're not getting any results.  I don't
 think that's a bug, but it might be possible to convince me otherwise.

It seems to me that the root is on the branch, in the sense that
cvs up -rBRANCH will yield it (i.e. it's on the branch in the
CVS sense, even if not in the RCS sense).

However, I can see wanting to ask either question:
  - For which files has someone actually committed something to
the branch?

  - Which files have branch tag X, i.e. which files will be in my
sandbox if I do cvs update -rX?

So it's hard to argue that either of the two behaviours is
correct or a bug; either one could be what the user's looking
for.

It's the same difference as that between cvs log -rX:Y and
-rX::Y.

--

|  | /\
|-_|/ Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED]
|  |  /
When I came back around from the dark side, there in front of me would
be the landing area where the crew was, and the Earth, all in the view
of my window. I couldn't help but think that there in front of me was
all of humanity, except me.
- Michael Collins, Apollo 11 Command Module Pilot



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


RE: detect a merge

2003-08-14 Thread Dickson, Craig
Title: RE: detect a merge





CvsGraph v1.4.0 has the ability to graphically show merges if you tag the branch and then the trunk (or other branch) after the merge with tag names that match particular regular expressions.

-Original Message-
From: [EMAIL PROTECTED] [mailto:[EMAIL PROTECTED]]
Sent: Sunday, August 10, 2003 8:56 PM
To: [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]
Subject: Re: detect a merge



Pedro Salazar writes:
 
 I made some merges in my project module but I didn't log with a suitable
 message on it saying that it was a merge from a specific branch in a
 specific revision. Can CVS track if specific revision was created by a
 merge from a branch? Or how could I know that?


CVS doesn't track merges. If you want to know about them, it's up to
you to track them (typically via log messages and/or tags).


-Larry Jones


Oh yeah? You just wait! -- Calvin



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


should we branch or tag every time we add a file?

2003-08-14 Thread Pedro Salazar
Greetings,

On specific time in my main branch, I decided to add a new file. Before
I add the new file to the main branch, should I tag with a symbolic name
or should I create a new branch where should exist the file?

For instance, if I don't add a new branch, I'll have to tag my module to
a reference without that file. Suppose if I want to get a previous
release where the new file has not been added I must have a tag or a
branch to avoid get all the files if some are from future revisions...

thanks,
Pedro.



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: problems with a CVS authentication

2003-08-14 Thread S.Magesh
HI,

Thanks for your reply ,

But ssh-add commands gives output like this

Could not open a connection to your authentication agent.

Is there anythingh to start??

I have started ssh-agent it started sucessfully.

Pls help me to sort out this issue.

S.Magesh

Contentment brings happiness even in poverty. Discontent brings
poverty, even in wealth.
- Original Message -
From: Mark D. Baushke [EMAIL PROTECTED]
To: S.Magesh [EMAIL PROTECTED]
Cc: [EMAIL PROTECTED]; Fabian Cenedese [EMAIL PROTECTED]
Sent: Monday, August 11, 2003 1:18 PM
Subject: Re: problems with a CVS authentication


 S.Magesh [EMAIL PROTECTED] writes:

  Iam using CVS Repository in RH 7.3 Linux server ,and i connect my server
  thru WINCVS via OpenSSH Authetication.
 
  My Problem is if i do any changes in my CVS it is asking password each
and
  every time.
 
  How do i stop this , is theri any configuration to make ???

 You will want to investigate the ssh-agent command to be used
 in conjunction with the ssh-add command.

  After searching google i tried SSH_KEYGEN and created public and private
  keys and placed the public keys in the server( renamed to authorized
_keys)
  but still the problem is not fixed.

 The name of the file is $HOME/.ssh/authorized_keys and/or
 $HOME/.ssh/authorized_keys2 (depending on the version of OpenSSH).

  Pls GURUS help us in solving this problem

 Enjoy!
 -- Mark

 Typical possibility:

 exec ssh-agent $SHELL
 ssh-add
 enter your pass phrase

 Now, assuming that the $HOME/.ssh/id_rsa.pub (or id_dsa.pub) file has
 been added to your $HOME/.ssh/authorized_keys2 file on the server, it
 should be possible to 'ssh server date' without entering your pass
 phrase.

 Enjoy!
 -- Mark




___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: problems with a unicode file

2003-08-14 Thread Fabian Cenedese

I am using WinCvs 1.3 . I added to my repository a pdf file with the 'add unicode' 
option since the system warned me when I tried to use  'add binary'. When I checked 
it out I couldn't open it because it results corrupted , so I've deleted the file and 
added it once again forcing WinCvs to use the binary mode. The problem is that the 
system keeps on adding it as a unicode ( -ku option) making it impossible for me to 
open that document. 
To resolve this situation, do I have to physically delete the file from the server? 
And if so which is the right way to do it (I mean do I have to look in the Attic or 
whatever...)? 

I think you can change the type to binary with the admin command. After
that you need to commit again a good version of the file.

bye  Fabi




___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: Newbie: problems adding directory to repository

2003-08-14 Thread Wu Yongwei
Jesse Sheidlower wrote:

The basic problem is that I had taken a specific program, and 
directory, called Book.pm and Book/ and then generalized it and
renamed them to MyDatabase.pm and MyDatabase/ . In my dev sandbox, I
have this directory called MyDatabase/ and there are a bunch of
programs underneath it that used to be in Book/ . But I can't seem to
get this directory onto the working server. When I go to the working
sandbox and type cvs update, it doesn't create MyDirectory/ or
anything underneath it; it's the same when I deleted the entire
sandbox and did a cvs checkout from scratch.

Yet in the development sandbox, it certainly thinks it's there-- when
I type cvs add MyDatabase/ or cvs add [any of the programs under
MyDatabase/] I get messages like there is a version in MyDatabase
already or SearchView.pm already exists, with version number 1.3.
Renaming the directories (or files) locally is far from enough.  It even
should never be done.  Check the CVS/Repository file and you should know
that CVS never knows your local change (and how could it know? you did
not inform it, did you?).  It still thinks the files are in the
MyDatabase directory (regardless of your local directory name).
The simple rule is never to rename.  If you are really uncomfortable,
you should remove the old files/directories and re-add them.  To do this
smoothly, you may have to read the manual carefully and have an
understanding how CVS works.  You are your CVS admin.
Best regards,

Wu Yongwei





___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Re: How to determine the previous revision number?

2003-08-14 Thread Eric Siegerman
On Thu, Aug 07, 2003 at 06:47:06PM -0700, Paul Sander wrote:
 This algorithm does not consider:
 [lots of things]

Woops, you're right!

The next time I have a sneaking suspicion I might be writing
beyond my knowledge ... I'll listen to it :-/

--

|  | /\
|-_|/ Eric Siegerman, Toronto, Ont.[EMAIL PROTECTED]
|  |  /
When I came back around from the dark side, there in front of me would
be the landing area where the crew was, and the Earth, all in the view
of my window. I couldn't help but think that there in front of me was
all of humanity, except me.
- Michael Collins, Apollo 11 Command Module Pilot



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


ViewCVS vs. CVSWeb with CVSNT

2003-08-14 Thread Portabill
Hello all,

Which web server is better/preferred for web access to the CVS repository?
ViewCVS or CVSWeb?

Reasons?

I hope this doesn't start a religious war.

Thanks,

Bill



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


history file question

2003-08-14 Thread Luis Gonzalez
Hi all´s:
Needs to depurating this file by date, anyone know your design
record ?. See string  enclosed by quotes.

F3f3006fd|rcortes|/d31/sistema/rcortes/temp.vta_carte.4gl|||temp.vta_carte
.4gl


Thanks in advance ...

Estimados Gurúes Hispanoparlantes:

Necesito depurar el archivo history por fecha, 
alguien conoce el
diseño de registro del mismo ?
Ver la cadena entrecomillada.

Desde ya muchas gracias ...




Luis C. González
Coordinador de Proyectos
Desarrollo de Sistemas - Tecnología
Provencred - Citigroup



___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs