local branches of a remote trunk...

2005-06-24 Thread dietrich bollmann
commit to the project in form of patches; some is experimental and not of interest to anybody else. To me it seems, as if the ideal solution to this situation would be some kind of hierarchy of branches of the original sources. The hierarchy could reflect the dependencies between my modifications

Re: Question on branches

2005-05-15 Thread Mark D. Baushke
ock commits within a CVS environment. > > We have an environment where we have several branches all created off > main. I would like to have the ability to manage the branches > indivdually where I can allow only certian users to commit changes to > which ever branch. Currently I can appl

Question on branches

2005-05-14 Thread Zeus Crisp
Hello all,   Hoping someone can help as I am a new users to CVS.   I would like to know if there is a way to lock a specific branch to block commits within a CVS environment.   We have an environment where we have several branches all created off main.  I would like to have the ability to manage

Re: branches and merging

2005-05-11 Thread Arno Schuring
ople find it desirable to create a tag on the destination branch just after the merge is complete so that they may be able to compare the tag on the source branch with the post-merge tag to determine the drift between the two branches (for purposes of discussion call this tag the 'post-sync-tag&#x

Re: branches and merging

2005-05-11 Thread Mark D. Baushke
>> some feedback first. (am referring to the > >> essential cvs guidebook) > >> > >> Have two branches app4 and app4_test, which I > >> need to merge (and have done so already into the > >> app4 branch, so merged from app4_test into app4) > >

Re: branches and merging

2005-05-11 Thread Arno Schuring
Venkatesh, Vijay <[EMAIL PROTECTED]> writes: I guess this is a fairly often asked question but just wanted to run this by everyone to get some feedback first. (am referring to the essential cvs guidebook) Have two branches app4 and app4_test, which I need to merge (and have done so alread

Re: branches and merging

2005-05-09 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Venkatesh, Vijay <[EMAIL PROTECTED]> writes: > I guess this is a fairly often asked question > but just wanted to run this by everyone to get > some feedback first. (am referring to the > essential cvs guidebook) > > Ha

branches and merging

2005-05-09 Thread Venkatesh, Vijay
Hi, I guess this is a fairly often asked question but just wanted to run this by everyone to get some feedback first. (am referring to the essential cvs guidebook) Have two branches app4 and app4_test, which I need to merge (and have done so already into the app4 branch, so merged from app4_test

Re: checking out multiple branches of a project

2005-04-23 Thread Russ Sherk
On 4/21/05, Jim.Hyslop <[EMAIL PROTECTED]> wrote: > Russ Sherk wrote: > > On 4/21/05, Jim.Hyslop <[EMAIL PROTECTED]> wrote: > > > Sure, piece of cake. Check out [sic] the -d option to the > > checkout command. > > > > > To be clear: > [etc]. > > I was _trying_ to encourage Chris to study the manua

Re: checking out multiple branches of a project

2005-04-21 Thread Spiro Trikaliotis
Hello Doug, * On Thu, Apr 21, 2005 at 09:59:30AM -0400 Doug Lee wrote: > I have often wished for an automatic way to check out all existing > branches of a given module with one command. Example: If I have > module mymod with HEAD and branches named rel1 and rel2: SVN has such an o

RE: checking out multiple branches of a project

2005-04-21 Thread Jim.Hyslop
Russ Sherk wrote: > On 4/21/05, Jim.Hyslop <[EMAIL PROTECTED]> wrote: > > Sure, piece of cake. Check out [sic] the -d option to the > checkout command. > > > To be clear: [etc]. I was _trying_ to encourage Chris to study the manual so he'd be more familiar with the options. Oh, well :-) -- Jim

RE: checking out multiple branches of a project

2005-04-21 Thread Jim.Hyslop
Doug Lee wrote: > I have often wished for an automatic way to check out all existing > branches of a given module with one command. Example: If I have > module mymod with HEAD and branches named rel1 and rel2: > > mkdir cvs_co > cd cvs_co > cvs co -b mymod > cd mymod >

Re: checking out multiple branches of a project

2005-04-21 Thread Russ Sherk
On 4/21/05, Jim.Hyslop <[EMAIL PROTECTED]> wrote: > Chris Cheshire wrote: > > I have a project in source control called mylib (for example) that > > contains libraries used for my various programs. Currently I need to > > make some changes to a development branch, as well as some changes to > > the

Re: checking out multiple branches of a project

2005-04-21 Thread Doug Lee
gt; > looks something like : > > > > ~/src/mylib/HEAD/... > > ~/src/mylib/dev-branch/... > > Sure, piece of cake. Check out [sic] the -d option to the checkout command. I have often wished for an automatic way to check out all existing branches of a given module with one

RE: checking out multiple branches of a project

2005-04-21 Thread Jim.Hyslop
Chris Cheshire wrote: > I have a project in source control called mylib (for example) that > contains libraries used for my various programs. Currently I need to > make some changes to a development branch, as well as some changes to > the head. I have been deleting one, checking out the other,

checking out multiple branches of a project

2005-04-20 Thread Chris Cheshire
I have a project in source control called mylib (for example) that contains libraries used for my various programs. Currently I need to make some changes to a development branch, as well as some changes to the head. I have been deleting one, checking out the other, deleting it, checking out the

RE: verifymsg and branches

2005-03-28 Thread Christopher.Fouts
[EMAIL PROTECTED] >Sent: Friday, March 25, 2005 12:16 PM >To: Fouts Christopher (IFNA MP DC); info-cvs@gnu.org >Cc: Matthew Doar (StF) >Subject: RE: verifymsg and branches > > >Thanks, I see we are after similar things. I followed Mark >Baushke's suggestion and wrote a sc

RE: verifymsg and branches

2005-03-25 Thread Matt Doar
Thanks, I see we are after similar things. I followed Mark Baushke's suggestion and wrote a script which parses client-side CVS/Entries files (a la cvs_acls) to find out which branches are being affected by the current commit, and then record this information in /tmp for the verifymsg invoc

Re: verifymsg and branches

2005-03-24 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Hi Matt, Matt Doar <[EMAIL PROTECTED]> writes: > I understand how verifymsg can be used to check the text in a commit > message. The problems is that I'd like to have different checks for > different branches, and there is no &q

RE: verifymsg and branches

2005-03-24 Thread Christopher.Fouts
5 3:04 PM >To: info-cvs@gnu.org >Cc: [EMAIL PROTECTED] >Subject: verifymsg and branches > > > >I understand how verifymsg can be used to check the text in a >commit message. The problems is that I'd like to have >different checks for different branches, and there

verifymsg and branches

2005-03-24 Thread Matt Doar
I understand how verifymsg can be used to check the text in a commit message. The problems is that I'd like to have different checks for different branches, and there is no "branch name" variable that I can see to pass into a script called from verifymsg. So I went to see how

RE: Renaming a file in the trunk but not in branches

2005-03-11 Thread Arthur Barrett
vsnt from http://www.cvsnt.org/ Regards, Arthur > -Original Message- > From: [EMAIL PROTECTED] > [mailto:[EMAIL PROTECTED] > ] On Behalf Of David Leskovac > Sent: Saturday, 12 March 2005 3:28 AM > To: info-cvs@gnu.org > Subject: RE: Renaming a file in the trunk but not in

Re: Renaming a file in the trunk but not in branches

2005-03-11 Thread Kaz Kylheku
On Fri, 11 Mar 2005, David Leskovac wrote: > Date: Fri, 11 Mar 2005 11:27:57 -0500 > From: David Leskovac <[EMAIL PROTECTED]> > To: info-cvs@gnu.org > Subject: RE: Renaming a file in the trunk but not in branches > > One additional question on this: > Is there any way

RE: Renaming a file in the trunk but not in branches

2005-03-11 Thread David Leskovac
One additional question on this: Is there any way to preserve history on the new file? My understanding is that if I copy the ,v to ,v on the server and then run the commands below on the client, then this will affect the trunk as well as the branches. Is this true? If true, is there any other

RE: Renaming a file in the trunk but not in branches

2005-03-11 Thread Jim.Hyslop
David Leskovac wrote: > Will the following commands work to rename a file in the > trunk but retain the old file name in all its branches?: > > cvs co > cvs remove -f > cvs add > cvs commit -m"Renamed to " Yes, that will work fine. -- Jim Hyslop Senior Soft

Renaming a file in the trunk but not in branches

2005-03-11 Thread David Leskovac
Hi, Will the following commands work to rename a file in the trunk but retain the old file name in all its branches?: cvs co cvs remove -f cvs add cvs commit -m"Renamed to " Thanks, -Dave ___ Info-cvs mailing list Info-cvs@gn

Re: CVS Merge between branches in two different repositories

2005-02-23 Thread Baurzhan Ismagulov
On Wed, Feb 23, 2005 at 05:03:23PM -0500, Larry Jones wrote: > > There are many spurious hunks due to the usage of $Id$, $Log$, etc. Is > > there an easy way to generate a diff without these hunks? > > -kk Thanks :) ! With kind regards, Baurzhan. ___

Re: CVS Merge between branches in two different repositories

2005-02-23 Thread Larry Jones
Baurzhan Ismagulov writes: > > There are many spurious hunks due to the usage of $Id$, $Log$, etc. Is > there an easy way to generate a diff without these hunks? -kk -Larry Jones I can do that! It's a free country! I've got my rights! -- Calvin __

Re: CVS Merge between branches in two different repositories

2005-02-23 Thread Baurzhan Ismagulov
On Wed, Feb 23, 2005 at 11:03:03AM -0500, Larry Jones wrote: > No, CVS has no way to know what the relationship is between things in > different repositories. You could use ``cvs diff'' to get the changes > from the one repository and then use ``patch'' to apply them to a > working directory from

Re: CVS Merge between branches in two different repositories

2005-02-23 Thread Larry Jones
Muk writes: > > I have two different repositories ( basically two trunks ) for the > same project. There are branches on both. I would like to merge branch > A on trunk 1 with branch B on trunk 2. Is this possible with cvs merge? No, CVS has no way to know what the relationshi

CVS Merge between branches in two different repositories

2005-02-23 Thread Muk
Folks, I have two different repositories ( basically two trunks ) for the same project. There are branches on both. I would like to merge branch A on trunk 1 with branch B on trunk 2. Is this possible with cvs merge? I tried to do this - > with trunk 2 as CVSROOT, cvs co -r B . with trunk 1

Re: keywords for branches and tags

2005-02-15 Thread Mark E. Hamilton
Glenn Franxman wrote: Thanks Jim! It turns out that the $Name$ tag is treated special.It gets expanded when the command is export, but not for checkout or update. Hmm, a little experimentation shows me that that is not correct, at least for 'cvs update': sahp6613% more test4.dat # $Name

Re: keywords for branches and tags

2005-02-15 Thread Glenn Franxman
Thanks Jim! I searched through the archives and found a lot of other posts covering the same problem.I did eventually find the needle in the haystack, so I thought I'd post it here to improve the problem:solution ratio. It turns out that the $Name$ tag is treated special.It gets

RE: keywords for branches and tags

2005-02-15 Thread Jim.Hyslop
Glenn Franxman wrote: > Please excuse the n00b question. I'd like to have some sort of text > inserted into my source code upon checkout, much like the $id: $ and > other tags, but would contain the branch id or latest tag. $Name$ seems to come the closest: https://www.cvshome.org/docs/manual/cvs

keywords for branches and tags

2005-02-15 Thread Glenn Franxman
Please excuse the n00b question. I'd like to have some sort of text inserted into my source code upon checkout, much like the $id: $ and other tags, but would contain the branch id or latest tag. Is there any such provision in cvs? Is there a reason that there wouldn't be or shouldn't be? _

RE: branches

2005-02-08 Thread Guus Leeuw jr.
> -Original Message- > From: [EMAIL PROTECTED] [mailto:info-cvs- > [EMAIL PROTECTED] On Behalf Of Annette Roll > Sent: mardi 8 février 2005 16:46 > > Is there any query I can run to find all branches in a repository? $ find . -name "*" | xargs cvs status -v

branches

2005-02-08 Thread Annette Roll
Is there any query I can run to find all branches in a repository? ___ Info-cvs mailing list Info-cvs@gnu.org http://lists.gnu.org/mailman/listinfo/info-cvs

Re: FW: can I checkout up to three branches into one workspace?

2005-01-21 Thread Pierre Asselin
Mark Hanna <[EMAIL PROTECTED]> wrote: > Pierre, > We don't ship src, but are currently in the situation where we have > numerous branches all with customer specific areas which are pulled into > the build. The maintenance of these branches with fixes having to be &

FW: can I checkout up to three branches into one workspace?

2005-01-19 Thread Mark Hanna
Pierre, Firstly thank you for your reply. We don't ship src, but are currently in the situation where we have numerous branches all with customer specific areas which are pulled into the build. The maintenance of these branches with fixes having to be merged between several branches has b

Re: can I checkout up to three branches into one workspace?

2005-01-18 Thread Pierre Asselin
a is to keep a generic branch and at a validated point, branch > off individual files onto customer specific branches (i.e. customer_A, > customer_B, etc). This point will also be used to create a branch for > fixes. [ ... ] Yeah, it can be done, but it's a lot of trouble. I would l

can I checkout up to three branches into one workspace?

2005-01-18 Thread Mark Hanna
t due to the increasing number of customers we want to change the way we work. We are looking to do the following of possible ? The idea is to keep a generic branch and at a validated point, branch off individual files onto customer specific branches (i.e. customer_A, customer_B, etc). This point

RE: Is there any tool that can compare relevant java code in two branches ?

2005-01-13 Thread Matt Doar
[mailto:[EMAIL PROTECTED] > On Behalf Of Jim.Hyslop > Sent: Thursday, January 13, 2005 10:35 AM > To: info-cvs@gnu.org > Subject: RE: Is there any tool that can compare relevant java > code in two branches ? > > [EMAIL PROTECTED] wrote: > > Does anyone here know if it exists s

RE: Is there any tool that can compare relevant java code in two branches ?

2005-01-13 Thread Jim.Hyslop
[EMAIL PROTECTED] wrote: > Does anyone here know if it exists some tool that can generate html > pages that illustrate all relevant (! , see comment below) differences > between two branches and can take the following inputs: > * The two branches > * A java method (or class) >

Is there any tool that can compare relevant java code in two branches ?

2005-01-13 Thread Tomas
Does anyone here know if it exists some tool that can generate html pages that illustrate all relevant (! , see comment below) differences between two branches and can take the following inputs: * The two branches * A java method (or class) What I mean by using the word relevant above is that I

RE: Can I allow user to only have permission in branches but not HEAD?

2005-01-10 Thread Matt Doar
@gnu.org > Subject: Can I allow user to only have permission in branches > but not HEAD? > > Hi, I have a question about how access permissions on branches and > HEAD. I want to restrict certain CVS users to only be able to commit > their changes to branches but not the HEAD. Yet

Can I allow user to only have permission in branches but not HEAD?

2005-01-10 Thread David Jiao
Hi, I have a question about how access permissions on branches and HEAD. I want to restrict certain CVS users to only be able to commit their changes to branches but not the HEAD. Yet at the same time, I want to allow them to check out modules from the HEAD. Is this doable? Thanks! David Jiao

Re: Advice regarding Branches

2005-01-08 Thread Pierre Asselin
jeetu mahtani <[EMAIL PROTECTED]> wrote: > [ ... ] > Since we may need to do patch releases in the interim I have both of > them working in their own branches to isolate Main. The usual approach is to start a support branch at every release point. Your patch release would

Re: Advice regarding Branches

2005-01-08 Thread jeetu mahtani
working on a separate branch and not the Main trunk. The other developer is working on an enhancement but this is short term. Since we may need to do patch releases in the interim I have both of them working in their own branches to isolate Main. Now the second developer is done with his enhancement

Re: Advice regarding Branches

2005-01-05 Thread Pierre Asselin
jeetu mahtani <[EMAIL PROTECTED]> wrote: > We have several developers working on various branches. One of the > developers is done with his fixes so I merged his branch into the Main > trunk. Now the other developers who are working on their respective > Branches need to al

Advice regarding Branches

2005-01-05 Thread jeetu mahtani
Hi All, We have several developers working on various branches. One of the developers is done with his fixes so I merged his branch into the Main trunk. Now the other developers who are working on their respective Branches need to also get these fixes. How do I make this Merge so the various

RE: upgrading cvs and merging branches

2004-12-06 Thread Jim.Hyslop
Donald Skidmore wrote: > I have two questions: > I created a branch using: cvs tag -b -r v1.2 v1.2-patches myfile.c > I then did cvs up -r v1.2-patches myfile.c > I modified the file and did a commit > I then did a cvs up -j v1.2-patches and it should the file was merged. > followed by a cvs up

upgrading cvs and merging branches

2004-12-03 Thread Donald Skidmore
I have two questions: I created a branch using: cvs tag -b -r v1.2 v1.2-patches myfile.c I then did cvs up -r v1.2-patches myfile.c I modified the file and did a commit I then did a cvs up -j v1.2-patches and it should the file was merged. followed by a cvs up -A and finally a cvs up -r v1.2 myf

Re: List of branches

2004-12-01 Thread Paola Attadio
Thank you very much! Best Regards, Paola Mark D. Baushke wrote: -BEGIN PGP SIGNED MESSAGE- Hash: SHA1 prem pathak <[EMAIL PROTECTED]> writes: I have a requirement to get the complete list of brnaches exists in a specific repository. Do u guys have any idea, how to get i

Re: how to check out a project which contains modules from different branches

2004-11-11 Thread Frederic Brehm
I have done this for a project. It was very successful. It was in MS Windows, too. Also, useful to our environment, each of those cvs checkout commands can have different CVSROOT values. Once the checkout is done, CVS keeps track of the repository for each directory and there is no problem with

Re: how to check out a project which contains modules from different branches

2004-11-10 Thread Pierre Asselin
Li Chou <[EMAIL PROTECTED]> wrote: > Hi, I tried to figure out a single step of check out a project that > contains modules from different branches of different project. > For example, Project X has 3 modules, A and B which are from other > projects. I need to check out modul

how to check out a project which contains modules from different branches

2004-11-10 Thread Li Chou
Hi, I tried to figure out a single step of check out a project that contains modules from different branches of different project.   For example, Project X has 3 modules, A and B which are from other projects.   I need to check out module A's of Project Y branch_2.5, and module B of Pr

Re: List of branches

2004-10-28 Thread Mark D. Baushke
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 prem pathak <[EMAIL PROTECTED]> writes: > I have a requirement to get the complete list of > brnaches exists in a specific repository. Do u guys > have any idea, how to get it. You may wish to look into using cvs2cl.pl (see http://www.red-bean.com/cv

List of branches

2004-10-28 Thread prem pathak
Hi All, I have a requirement to get the complete list of brnaches exists in a specific repository. Do u guys have any idea, how to get it. Prem __ Do you Yahoo!? Yahoo! Mail - You care about security. So do we. http://promotions.yahoo.co

Re: What's the best way to work with branches.

2004-10-08 Thread Greg A. Woods
[ On Tuesday, October 5, 2004 at 23:07:56 (+0200), Kevin Drapel wrote: ] > Subject: What's the best way to work with branches. > > I work on a project with another "admin". We have a set of developers > but we don't fully trust their work and we want to "mode

AW: What's the best way to work with branches.

2004-10-05 Thread Guus Leeuw jr.
> Von: [EMAIL PROTECTED] > [mailto:[EMAIL PROTECTED] Im > Auftrag von Kevin Drapel > Gesendet: dinsdag 5 oktober 2004 23:08 > Betreff: What's the best way to work with branches. > > I work on a project with another "admin". We have a set of developers >

What's the best way to work with branches.

2004-10-05 Thread Kevin Drapel
ommit/apply modifications to his branch but he has read access to the whole module. Admins have of course permissions on all branches. After reading the CVS manual, especially the chapter about branches ("Merging from a branch several times"), I guess that we will have a lot of problems

Re: Help with merge between 2 branches

2004-08-11 Thread PL
Are you sure you are doing 'diff' aganist v1.1.1.1? Since you are omitting one of the two versions you are comparing, 'cvs diff' compares with HEAD version (I think). /Peter <[EMAIL PROTECTED]> wrote in message news:<[EMAIL PROTECTED]>... > I've done this a million times now so this puzzles me. >

Help with merge between 2 branches

2004-08-10 Thread Christopher.Fouts
I've done this a million times now so this puzzles me. I'm trying to merge from branch b_dev_01_03_cf into b_dev_01_03. Please explain the following Using cvs v1.11.17. Clearly there is a diff. between the two versions for this particular file (v1.1.1.1 on b_dev_01_03, which is checked out,

Re: Sharing files between branches

2004-06-29 Thread Larry Jones
Russ writes: > > In there any way to tweak a file so that it's shared between all branches? No. -Larry Jones Nobody knows how to pamper like a Mom. -- Calvin ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs

Sharing files between branches

2004-06-29 Thread Russ
In there any way to tweak a file so that it's shared between all branches? TIA - russ - ___ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs

Re: write access allowed on branches only

2004-05-05 Thread Yves Guerte
-2532-6335 > > > > > > -Mensagem original- > > De: [EMAIL PROTECTED] > > [mailto:[EMAIL PROTECTED] nome de Yves > > Guerte > > Enviada em: quinta-feira, 29 de abril de 2004 13:08 > > Para: [EMAIL PROTECTED] > > Assunto: write access allo

RES: write access allowed on branches only

2004-05-04 Thread Marcelo Carvalho Fernandes
-2532-6335 > -Mensagem original- > De: [EMAIL PROTECTED] > [mailto:[EMAIL PROTECTED] nome de Yves > Guerte > Enviada em: quinta-feira, 29 de abril de 2004 13:08 > Para: [EMAIL PROTECTED] > Assunto: write access allowed on branches only > > > Hi everyone, > >

write access allowed on branches only

2004-04-29 Thread Yves Guerte
Hi everyone, Is it possible in a CVS repository to set the main line read-only for a group of people and read-write only in branches ? Thanks, Yves ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs

Permissions and branches

2004-04-14 Thread Euan Guttridge
Is it possible to limit (write) access to a specific branch for specific users? Thanks Euan ___ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs

Re: cvs log for tag and branches

2004-04-07 Thread Derek Robert Price
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Jim.Hyslop wrote: >>and when the branch or tag was done. > > >CVS does not keep track of when tags or branches are applied. You might be >able to track that using the taginfo script. See >http://www.cvshome.org/docs/manual/cv

RE: cvs log for tag and branches

2004-04-07 Thread Jim.Hyslop
Ramanuj Singh wrote: > This message is in MIME format. Since your mail reader does not understand > this format, some or all of this message may not be legible. Please do not post MIME-encoded messages to this list > How to see logs of tags and branches in project cvs log > to kn

cvs log for tag and branches

2004-04-06 Thread Ramanuj Singh
Title: cvs log for tag and branches How to see logs of tags and branches in project to know who is the owner of branch and tag and when the branch or tag was done. The information transmitted is intended only for the person or entity to whom it is addressed and may contain confidential and

Re: [Q] Vendor Branches and Updates

2004-03-19 Thread Larry Jones
John Muller writes: > > This message is in MIME format. Since your mail reader does not understand > this format, some or all of this message may not be legible. Please do not send MIME and/or HTML encrypted messages to the list. Plain text only, PLEASE! > If I attempt to merge both of these fil

RE: [Q] Vendor Branches and Updates

2004-03-19 Thread Jim.Hyslop
John Muller wrote: > Supposed we have two files from a module (file1 and file2). > file1 has been locally modified, but file2 has not. > If I attempt to merge both of these files (in one import > command). What happens to file1? > 1) Does it become the head revision automatically? > 2) Or do

[Q] Vendor Branches and Updates

2004-03-19 Thread John Muller
Title: [Q] Vendor Branches and Updates Supposed we have two files from a module (file1 and file2).  file1 has been locally modified, but file2 has not. If I attempt to merge both of these files (in one import command).  What happens to file1? 1) Does it become the head revision

Re: Tagging across branches?

2004-03-18 Thread Andy Jones
Thanks for the help, all. No, I wasn't planning on doing a checkout - I assumed that that would crash and burn somehow - just an export. Larry Jones wrote: >Just a terminology clarification -- everything in $CVSROOT is a single >repository. Its subdirectories are "top-level directories" (o

Re: Tagging across branches?

2004-03-17 Thread Larry Jones
Andy Jones writes: > > I have a repository - that is, a subdirectory of $CVSROOT - which has > a number of subdirectories. Just a terminology clarification -- everything in $CVSROOT is a single repository. Its subdirectories are "top-level directories" (or "modules" although, strictly speaking,

RE: Tagging across branches?

2004-03-17 Thread Conrad T. Pino
Hi Andy, > From: [EMAIL PROTECTED] On Behalf Of Jim.Hyslop > > If they will be modifying the code, then your approach will not work. They > will have to check out the branch tag for the legacy branch. You > might want > to write a simple script or batch file that will check out the appropriate > d

RE: Tagging across branches?

2004-03-17 Thread Jim.Hyslop
Andy Jones wrote: > I have a repository - that is, a subdirectory of $CVSROOT - > which has a number of subdirectories. > > For one of these subdirectories I have created a branch, and > in my sandbox have checked out that branch. So in my sandbox > I have the main trunk except for one directo

Tagging across branches?

2004-03-17 Thread Andy Jones
Hi all, I have a repository - that is, a subdirectory of $CVSROOT - which has a number of subdirectories. For one of these subdirectories I have created a branch, and in my sandbox have checked out that branch. So in my sandbox I have the main trunk except for one directory, which is sticky o

Re: Can wincvs graph all versions/branches for a module?

2004-03-12 Thread Kaz Kylheku
t one. > Apparently, VSS can show a graph of versions/branches for a module, and I > cannot figure out how to do that in wincvs. The graph function seems only > to work for individual files. Am I missing some way to do this? No. But on the other hand, VSS requires you to merge files indiv

Re: Can wincvs graph all versions/branches for a module?

2004-03-12 Thread Tom Copeland
On Fri, 2004-03-12 at 15:14, Mark D. Baushke wrote: > CvsGraph is a repository grapher (http://www.akhphd.au.dk/~bertho/cvsgraph/) > especially used in conjunction with ViewCVS is a reasonable way to do it. Yup, it works well, even when the graphs get rather large: http://rubyforge.org/cgi-bin/vi

RE: Can wincvs graph all versions/branches for a module?

2004-03-12 Thread Jim.Hyslop
Kaz Kylheku wrote: > On Thu, 11 Mar 2004, McMaster, James C (Jim) wrote: > > > Some members are still complaining about all the things cvs > > "won't do", and > > pining for Visual SourceSafe. > > These people need their heads examined. Hehe. Ahem. Yes, well, be that as it may... > No. But on t

Re: Can wincvs graph all versions/branches for a module?

2004-03-12 Thread Mark D. Baushke
Safe. (This really means they don't know how to do > what they want in cvs, and don't want to learn.) > > So far, I have been able to demonstrate almost everything, except one. > Apparently, VSS can show a graph of versions/branches for a module, and I > cannot figure out

Can wincvs graph all versions/branches for a module?

2004-03-12 Thread McMaster, James C (Jim)
nstrate almost everything, except one. Apparently, VSS can show a graph of versions/branches for a module, and I cannot figure out how to do that in wincvs. The graph function seems only to work for individual files. Am I missing some way to do this? Thank you. -- Jim McMaster Sr. Software Systems

Re: edit document in several branches simultaneously

2004-02-24 Thread Derek R. Price
I'm moving this discussion to [EMAIL PROTECTED] If you reply to this email, please remove [EMAIL PROTECTED] from the address list. Paul Gelderblom (ptok) wrote: I checked with Matthew Ogilvie, who earlier published a version of the advisory locks patch including documentation and test cases. Ma

Re: edit document in several branches simultaneously

2004-02-22 Thread Paul Gelderblom \(ptok\)
Paul Gelderblom (ptok) wrote: > > >edit -c (regrettably in my opinion) is not a part of the official > version of > >CVS which is the subject of this mailing list. There is a patch available Derek Rober Price wrote: > Other than that, I have and still do consider that patch to be a great > idea!

Re: edit document in several branches simultaneously

2004-02-19 Thread Derek Robert Price
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 Paul Gelderblom (ptok) wrote: >edit -c (regrettably in my opinion) is not a part of the official version of >CVS which is the subject of this mailing list. There is a patch available It is the longstanding policy of this team that changes to the sou

Re: edit document in several branches simultaneously

2004-02-19 Thread Paul Gelderblom \(ptok\)
likely you are talking to a cvsnt server (find out using "cvs version"). See www.cvsnt.com for info on that cvs server flavour. The version of edit -c I know indeed behave as you describe : edit -c foo locks all versions of the foo file on all branches - so it is intended behaviour. Your

edit document in several branches simultaneously

2004-02-19 Thread Axel Benz
versioning path is branched, with cvs edit -c mydocument mydocument is "locked" (better: tagged as being edited) in both branches. In my opinion, this does not make sense, since the versions of the document reside in different branches and can be totally different from each other. Why b

Re: sticky non-branch tags are sometines treated as branches in

2003-12-09 Thread Alvaro Martinez Echevarria
On Tue, 9 Dec 2003, Larry Jones wrote: > Alvaro Martinez Echevarria writes: > > > > In this case cvs has to create parent and then > > parent/anotherparent before checking out the subdirectory we are > > really interested in. Not only parent and parent/anotherparent > > have a CVS/Tag file (IMO th

Re: sticky non-branch tags are sometines treated as branches in

2003-12-09 Thread Larry Jones
Alvaro Martinez Echevarria writes: > > In this case cvs has to create parent and then > parent/anotherparent before checking out the subdirectory we are > really interested in. Not only parent and parent/anotherparent > have a CVS/Tag file (IMO they shouldn't at all), but their tag is > marked as

Re: sticky non-branch tags are sometines treated as branches in empty

2003-12-09 Thread Eric Siegerman
rent and parent/anotherparent] after running the > checkouts? If you do that, then instead of "generating random branches all over the place every time you try to add new files or directories", you'll simply generate random trunk revisions. Probably not what you want. Instead, r

Re: sticky non-branch tags are sometines treated as branches in empty

2003-12-09 Thread Alvaro Martinez Echevarria
branch" SOMEOTHERTAG on parent/CVS/Tag. So if you are not careful you end up generating random branches all over the place every time you try to add new files or directories. My question is, because I invoke the above commands from a wrapper, is it a valid and safe workaround to manually rem

Re: sticky non-branch tags are sometines treated as branches in empty

2003-12-03 Thread Larry Jones
"Paul Gelderblom \(ptok\)" writes: > > This is a multi-part message in MIME format. Please do not send MIME and/or HTML encrypted messages to the list. Plain text only, PLEASE! > However, we have found out that sometimes commit on these sticky tags > succeed, because CVS somewhere in the process

sticky non-branch tags are sometines treated as branches in empty directories - Bug?

2003-12-03 Thread Paul Gelderblom \(ptok\)
Hi all,   We often checkout using a sticky tag, so that developers can work with baselines of code. Normally, checkins on files or directories with a sticky non-branch tag are disabled, which is correct.   However, we have found out that sometimes commit on these sticky tags succeed, because

Re: Rephrasing: question about merging branches

2003-11-07 Thread David Wood
each file. If individual files can't merge, and only whole branches can, I confess I don't understand why that is true, unless by saying the "general case" we are actually discussing something different than I imagine. One other thing I was wondering about was what I found

Re: Rephrasing: question about merging branches

2003-11-06 Thread Derek Robert Price
-BEGIN PGP SIGNED MESSAGE- Hash: SHA1 David Wood wrote: |Derek Robert Price <[EMAIL PROTECTED]> wrote on 11/06/2003 08:57:22 AM: | |>The way to avoid only processing this for whole branch merges is to |>track individual commits as change sets. For example, store that the |>sum of changese

Re: Rephrasing: question about merging branches

2003-11-06 Thread David Wood
Derek Robert Price <[EMAIL PROTECTED]> wrote on 11/06/2003 08:57:22 AM: > The way to avoid only processing this for whole branch merges is to > track individual commits as change sets. For example, store that the > sum of changesets for file1 1.2 -> 1.2.4.7 have been merged into the > trunk. The

Re: Rephrasing: question about merging branches

2003-11-06 Thread Derek Robert Price
ncorporate the code. | | |I am hopeful that someone will be me. | |My initial approach has been to use a "wrapper" which executes branches |and merges, generating and applying tags in addition to branching and |merging, and maintaining extra state data in a database. I believe that |the too

  1   2   3   4   5   6   >