How to determinate in which branch file was remove

2005-04-12 Thread Victor A. Prylipko
I'm trying to write script to log changes in cvs it calling from CVSROOT/loginfo DEFAULT /var/Disks/cvs/TEST/CVSROOT/test.pl %{sVv} in test.pl just print its argument print \$ARGV[0] = .$ARGV[0].\n; now the cvs commands sequence cvs add -- 01 (in directory

Re: tagging an alias module

2005-04-12 Thread Jean-Pierre Sevigny
Cool! Very simple! Tyvm. Doh! I left out a really important '!'. Sorry. Your module should be: mymodule -a !Project/Web/Clientx Project/Web (See section C.1.4 of Cederqvist for a little more info. ;) Mark E. Hamilton wrote: Jean-Pierre, Jean-Pierre Sevigny wrote: Hi, I have a module, say

Problems after branching

2005-04-12 Thread Maik Walter
Hi, I use a SuSE SLES 9 server with CVS 1.11.14. After branching and new checkout for this new branch I have the strange effect that some directories from project have in their CVS/Tag file the entry Nbranch-name instead of Tbranch-name. All files in the relevant directories have in CVS/Entries

Re: trouble with cvs add

2005-04-12 Thread Martín Marqués
El Dom 10 Abr 2005 18:55, Pierre Asselin escribió: Mart?n Marqu?s martin@bugs.unl.edu.ar wrote: I have a project with some branches. One of those branches is a posible 1.2 release in which we are working out some problems. The thing is that I add some files to the HEAD which I need in the

Re: trouble with cvs add

2005-04-12 Thread Russ Sherk
To do a merge, you type something like: cvs co -rBRANCH_1_2 cvs up -jHEAD myNewFile myNewFile2 myNewFile3 [...] Then cvs should say something like adding new file blah... use cvs ci to commit changes. Carefully check that all files where brought over correctly. Then check them in. --Russ On

Re: how to undo import

2005-04-12 Thread Kevin Rodgers
Kevin Rodgers wrote: I'm trying (for the first time) to track a large 3rd party distribution. So of course I screwed it up: I unzip'ed the distribution in the working directory itself and then imported it, which resulted in all the CVS subdirectories being imported into the repository. Further, I

Re: Problems after branching

2005-04-12 Thread KS
cvs watch is probably on. just change the unix permissions on the working copy and it should temporarily fix it. the other option is to use cvs edit and unedit before and after doing work on the working copy, but it has its own side effects. Maik Walter wrote: Hi, I use a SuSE SLES 9 server

RE: Problems after branching

2005-04-12 Thread Jim.Hyslop
KS wrote: cvs watch is probably on. just change the unix permissions on the working copy and it should temporarily fix it. the other option is to use cvs edit and unedit before and after doing work on the working copy, but it has its own side effects. Maik Walter wrote: (cvs add:

RE: Problems after branching

2005-04-12 Thread Jim.Hyslop
Maik Walter wrote: I use a SuSE SLES 9 server with CVS 1.11.14. After branching and new checkout for this new branch I have the strange effect that some directories from project have in their CVS/Tag file the entry Nbranch-name instead of Tbranch-name. All files in the relevant

RE: Problems after branching

2005-04-12 Thread Jim.Hyslop
I wrote: cvs watch for a reason - do not subvert that reason by simply restoring read access locally. Oops - sed 's/read access/write access' -- Jim Hyslop Senior Software Designer Leitch Technology International Inc. ( http://www.leitch.com ) Columnist, C/C++ Users Journal (

Problems updating rep

2005-04-12 Thread Eduardo Mendes
Hello I have added some doc (word for windows) and xls (excel) files to a rep.  What I did was: cvs add zzz.pdf xxx.doc yyy.xls cvs ci -m Adding doc and xls files cvs admin -kb zzz.pdf xxx.doc yyy.xls No problem so far, but when I try to cvs ci -m Updating a file, cvs returns: cvs commit:

alias module that checks out a particular branch

2005-04-12 Thread Jean-Pierre Sevigny
Modules are cool! Is it possible to declare a module that does a checkout of a branch, i.e. something like: product_A = product branch A product_B = product branch B Regards, JP ___ Info-cvs mailing list Info-cvs@gnu.org

Re: Problems updating rep

2005-04-12 Thread Russ Sherk
On Apr 12, 2005 5:21 PM, Eduardo Mendes [EMAIL PROTECTED] wrote: Hello I have added some doc (word for windows) and xls (excel) files to a rep. What I did was: cvs add zzz.pdf xxx.doc yyy.xls cvs ci -m Adding doc and xls files cvs admin -kb zzz.pdf xxx.doc yyy.xls No problem so far,

Re: Problems updating rep

2005-04-12 Thread Larry Jones
Eduardo Mendes writes: cvs add zzz.pdf xxx.doc yyy.xls cvs ci -m Adding doc and xls files cvs admin -kb zzz.pdf xxx.doc yyy.xls No problem so far, but when I try to cvs ci -m Updating a file, cvs returns: cvs commit: Examining . cvs commit: Up-to-date check failed for `zzz.pdf' cvs

Re: trouble with cvs add

2005-04-12 Thread Pierre Asselin
Mart?n Marqu?s martin@bugs.unl.edu.ar wrote: El Dom 10 Abr 2005 18:55, Pierre Asselin escribi?: One way is to add them to the branch first, and then merge that change to the trunk. But it's too late for that. How would this be done? By deciding ahead of time that the files should be

Re: how to undo import

2005-04-12 Thread Pierre Asselin
Kevin Rodgers [EMAIL PROTECTED] wrote: Should I infer from the complete lack of responses over the last 5 days that my only option is to delete the distribution directory in the repository itself, and start over with the current version? That may be, or possibly the original question wasn't