How to force update?

2004-03-18 Thread Dickson, Craig
Title: How to force update?





I was wondering if there is a way when running an update to force it to re-get a file even if it appears to be up to date in the local sandbox? In other words, I would like the update command to get ever file from the repository even if they appear to not need it.

Thanks



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


How to determine what tag a branch was based on?

2004-02-03 Thread Dickson, Craig
Title: How to determine what tag a branch was based on?





Here is the scenario:


Sometime in the past I created a Branch based on a tag that existed on the files on my main branch. Now I need to go back and find out exactly which tag was used as the base of the branch.

Is there a way to determine this conclusively? Our problem is that there has been many tags applies since the branch was created so the "base" files now have multiple tags on them.

Any input would be appreciated.


Craig



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


RE: what to use to see merged files?

2003-12-17 Thread Dickson, Craig
Title: RE: what to use to see merged files?





And if you follow strict tag naming conventions, ViewCVS will actual draw a line on its graphs showing you those merge points between branches. This is probably exactly what you want.

-Original Message-
From: Peter Connolly [mailto:[EMAIL PROTECTED]]
Sent: Wednesday, December 17, 2003 12:54 PM
To: 'Phil Labonte'
Cc: '[EMAIL PROTECTED]'
Subject: RE: what to use to see merged files?



CVS does not implicitly maintain this information. That is why it's important to follow an *explicit* tagging discipline when merging.  See:

http://mail.gnu.org/archive/html/info-cvs/2002-12/msg00037.html


and 


http://mail.python.org/pipermail/spambayes-dev/2003-November/001597.html


for more.  


For example, you might tag all your merge sources as MERGESOURCE_,
or MERGESOURCE__ or whatever.  Say...MERGESOURCE_PROJECT_ABC_BRANCH_20031217.
Tag your targets with something similar so that it's easy to match source and target.
Say...MERGETARGET_PROJECT_ABC_BRANCH_20031217.


In any case, it's important for your organization to have a set of branch and merge tagging standards so that this information can be tracked.  CVS won't do it for you.

> -Original Message-
> From: [EMAIL PROTECTED] 
> [mailto:[EMAIL PROTECTED]] On 
> Behalf Of Phil Labonte
> Sent: Wednesday, December 17, 2003 12:15 PM
> To: [EMAIL PROTECTED]
> Subject: what to use to see merged files?
> 
> 
> I want to know if there is a windows app that will let me see 
> visually 
> which files have been merged together...
> 
> I have tried Tortoise, smartcvs, lincvs and wincvs all of them have a 
> revision graph but they do not show in the graph which to files have 
> been merged.
> 
> For instance... I have a file called filt.txt and I make 2 
> revisions so 
> main is revision 1.3, from the 1.3 revision I branch of to 
> 1.3.1.1. then 
> I make two revisions off the brached version and say I am now 
> at 1.3.1.3.
> 
> Now that I am done and I merge the 1.3.1.3 version back into the main 
> brach 1.3 to end up with 1.4. If  I do the revision graph I 
> do not see a 
> link from 1.3 to 1.3.1.1. Is there a way to see it?
> 
> Thanks
> 
> 
> 
> ___
> 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



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


Getting commitinfo changes back to client

2003-12-08 Thread Dickson, Craig



Hi,
 
I use a script 
called from my commitinfo file to format all Java files before they get comitted 
to the repository. This works fine, all Java files in the repository are 
formatted nicely.
 
However, if a client 
commits a file that does not conform to the formatting standard, and the 
pre-commit formatter changes the file before the actually commit, the client is 
unaware (apart from messages in the console). Effectively it means my CVS client 
says I have revision 1.5 of a file and the latest in CVS is also 1.5, but the 
files are actually different. If I do an update, nothing happens as the files 
according to the meta-information (dates etc.) are the same.
 
Is there a way to 
get these files "echoed" back to the client if they are changed so the client is 
synchronized properly with the repository?
 
I have a feeling 
this used to be how it worked, but I haven't had this setup for a 
while.
 
Thanks.
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


affect of large numbers of tags on performance

2003-11-26 Thread Dickson, Craig



Hi,
 
We use an automated 
build tool that performs many builds each day. Each time there is a successful 
build it applies an appropriate tag to our CVS repository. This has been running 
for a number of months now and on many files there are well over 100 tags - for 
files that don't change much, all 100 tags are on the same version number. 
Obviously this tag count is going to simply increase over 
time.
 
Does anyone know if 
we should be concerned about this? How does such a large number of tags affect 
performance (checkout, commit, tag, log etc)? How does it affect the size of the 
repository in terms of disk space? Should we be looking to implement a scheme to 
purge old tags?
 
Thanks.
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


how to roll-back whole commit operation

2003-09-15 Thread Dickson, Craig



What is the easiest 
way to roll-back a commit operation? I know when the commit happened and nothing 
has changed on that branch since the commit happened? I could use update with 2 
-j options, but there is over 150 changes in the commit, so I would have to do 
it once for each file if I understand it correctly since they all have 
difference revision numbers. Is there are way to update my working directory 
"backwards" so to speak?
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs


Control boilerplate for log messages

2003-09-10 Thread Dickson, Craig
Title: Control boilerplate for log messages





I have setup a log message template and activated for one of our modules through the rcsinfo file.


However when I go to commit my changes from the command line, in the editor window that pops up (Notepad), there is my template, but also the original boilerplate that appeared before when I didn't have a template (the one with the CVS: prefix on each line).

I have a couple of questions:


1. Is there a way to remove this boiler plate text?


2. Or if not, can I control what it says?


3. Can I use the same line prefix technique in my own template?


4. Lastly can I make my template appear below the boilerplate in the editor instead of above it?


Thanks.



___
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


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  -r  
 
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


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  -r  


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


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


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


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


How to determine the previous revision number?

2003-08-10 Thread Dickson, Craig



I am trying to 
customize some change reports we generate using the CVS tools available in Ant - 
which basically means I can execute any arbitrary CVS command 
line.
 
The reports can 
already determine what revisions of each file were committed between 2 dates - 
using a log command. What I would like to do is report the previous revision 
number which is not easily obtained from the output from the log command. Is 
there a way from the log output to determine the previous revision number for 
any of the revisions committed in the log ouput for a single file? Or 
alternatively is there a known algorithm, that given a CVS revision number, can 
determine what the previous revision number was?
 
Not sure if I 
explained that clearly. :)
 
Thanks
___
Info-cvs mailing list
[EMAIL PROTECTED]
http://mail.gnu.org/mailman/listinfo/info-cvs