RCS_checkout: Assertion
Hiya, I have a project that has a 2nd level branch: HEAD branch_level1 branch_level2 I now wish to merge everything from branch_level2 (and branc_level1) into the HEAD branch, so first I "cvs update -A"'d to get the head branch, merging in branch_level2 didn't seem like it merged everything, so I tried to merge branch_level1 (from the HEAD) and got the following error: R SourceCode/DatasetEdit.dfm cvs: rcs.c:4338: RCS_checkout: Assertion `rev == ((void *)0) || (__ctype_b[(int) (((unsigned char) *rev))] (unsigned short int) _ISdigit)' failed. Terminated with fatal signal 6 *CVS exited normally with code 1* So I need to merge branch_level2 into branch_level1 first, THEN branch_level1 into HEAD? -- "We don't guarantee anything except that it will take up disk space..." Apache 2.0alpha5 Disclaimer Now Playing: no audio cd present
Commit counter to log_accum
Hiya, a while ago I made the following patch to the contributed log_accum
script in the CVS package, it simply (and in a rather hacked
together/non-configurable way) adds a counter/id number to each commit,
this was mainly for vanity/tracking usage to see how often we were
actually using CVS.
I was wondering if this patch would like to be tidied up by something more
knowlegable with perl and stuff to make it configurable from the
commandline (i.e --usecounter) (of course, the counter should be updated
nontheless, just not printed on the emails).
Also, on line 321 I changed the printed module name to include the first
two levels of the module (we seperate our projects out like app/proj1
app/proj2), I'm sure how to do it, but making this level configurable
could be cool (i.e. --displaymodulelevel 2).
Anyway, I thought I'd be nice and share this patch with you all :P
Mark
[root@cvs contrib]# diff log_accum.orig log_accum
226a227,238
# Add commit counter - MD 20.05.2000
$counterfile = "/tmp/cvs.counter";
$cvscounter = 0;
open(counterfile, "$counterfile");
$cvscounter = counterfile;
close(counterfile);
$cvscounter++;
open(counterfile, "$counterfile");
print counterfile "$cvscounter\n";
close(counterfile);
229c241
print MAIL "Subject: CVS Update: " . $modulename . "\n";
---
print MAIL "Subject: CVS Update (#" . $cvscounter
. "): " . $modulename . "\n";
321c333
$modulename = $path[0]; # I.e. the module name == top-level dir
---
$modulename = $path[0] . "/" . $path[1];
494a507,512
@lines = read_logfile("$LOG_FILE.$i.$id", "\t");
if ($#lines = 0) {
push(@text, "Log message:");
push(@text, @lines);
push(@text, "");
}
513,518c531
@lines = read_logfile("$LOG_FILE.$i.$id", "\t");
if ($#lines = 0) {
push(@text, "Log message:");
push(@text, @lines);
push(@text, "");
}
---
# Log Message was here.
[root@cvs contrib]#
--
"We don't guarantee anything except that it will take up disk space..."
Apache 2.0alpha5 Disclaimer
Now Playing: Steve Stevens - Desperate Heart
Re: [ANN] WinCvs 1.1b14 is out
On Mon, 19 Jun 2000, Alexandre Parenteau wrote: http://devnet.3d.com/cvsweb/cvsweb.cgi/cvsgui/ChangeLog http://www.wincvs.org/download.html Whilst not actually on the webpage yet, the file is there at http://www.wincvs.org/WinCvs11b14.zip Mark -- Inspired by the taste of horror, proud to be insane forever Let out the killer in me! (c) Dismal Euphony Now Playing: no audio cd present
TortoiseCVS
Hiya, I just installed TortoiseCVS on my NT box (from WinCVS.org - Explorerj Shell CVS client) - only, I can't do anything as it says I'm not logged in, so obviously its not sharing the .cvspass I use for WinCVS. I've seen a few bugs listed on the BugZilla page about this, but nothing that says HOW one can get Tortoise to login... I tried copying my .cvspass to the Tortoise install dir but that didn't work any ideas?? -- Inspired by the taste of horror, proud to be insane forever Let out the killer in me! (c) Dismal Euphony Now Playing: - The Crystal Method / Now is the Time
Error Messages
The other day I started changing some of my error messages in my app to
use the format mentioned on the GNU coding standards page, i.e.
filename:linenumber: message
But I soon came to the conclusion that as files got edited this would
cause problems with the line numbers not matching. I was wondering if
there was anyway that this could be done via cvs via a commit wrapper,
doing a grep -n on one of my source files I get information like:
$ grep -n DebugFmt Main.PAS
545: DebugFmt('main.pas:542: starting steamfield manager (%s)',
Is there someway I could do something with perl/sed/awk/grep to search for
lines containing "DebugFmt('" and replacing all text upto the first space
with 'filename:linenumber:'?
I know it should be feasible, I'm just not sure how I'd do it, anyone able
to come up with a solution?
Mark
Re: CVS logs in SQL databases
On Sun, 28 May 2000, Mark Derricutt wrote: Inserting the data is one thing, the other side would be to write some PHP code for a web-based front-end to this log for generating various Actually, I was just thinking, how does one get the name of the current cvs user? Also, does the filename include the module/path or is it just the filename?
Date of Tags
Is it possible to get the date of a tag out of cvs? Or is this something that can be added for new versions? i.e. "cvs status -v filename" gives me a list of existing tags: Existing Tags: sfman_1_73_20 (revision: 1.22.2.24) Can this be extended to (if asked for with a param) to do something like: Existing Tags: sfman_1_73_20(revision: 1.22.2.24, 12-03-00 23:40:00) (or some other suitable format). Is the date/time of a tag operation actually recorded? -- Mark Derricutt "People in prayer for me, everyone there for me, ICQ: 1934853 sometimes I feel I should face this alone, my Wrk: 377-9941 soul exposed... it calm's me to know that I Fax: 377-9947 won't!" = Dream Theater - Scarred DDI: 375-3754 Now Playing: no audio cd present
CVS logs in SQL databases
Hi, I was wondering if anyone here had ever set something up to store there cvs log history in an sql database. I'm looking at doing having the following table (most likely postgresql): commit_id serial commit_time datetime module_name varchar(255) branch_name varcahr(255) user_name varchar(32) version varchar(32) log_message text Inserting the data is one thing, the other side would be to write some PHP code for a web-based front-end to this log for generating various changelogs and stats (most commits by module/branch/user). But before I go about doing something like this, I was wondering if anyone had already done something similiar? Or if anyones got any thoughts about what I could add in? Another useless feature I was thinking of putting in was some kind of release management, another table which just records release_date, release_by, version, download_url, release_notes. When the user selects "make new release", generate a 'crude/raw' relese message comprised of a preset header/footer, and a list of all log messages since the last 'release', the user could then go and edit this 'changelog' into a more end-user friendly 'release notes'. Has anyone made anything like this? Would anyone be interesting in something like this? Mark
Re: WinCVS: cvsignore
On Fri, 26 May 2000, Win32 M$ wrote: As I understand it - WinCvs does not know anything about cvsignore 'cause it can't see it! It can see .cvsignore as you noticed You can place a 'global' .cvsignore in your selected "home directory" which WinCVS will use, it will also pick up and use (in addition to the global) any .cvsignore file in the sandbox. Mark
Re: WinCVS: cvsignore
On Fri, 26 May 2000, Dimitrie O. Paun wrote: You can place a 'global' .cvsignore in your selected "home directory" which WinCVS will use, Which "home directory"? The first time you ran WinCVS it would have asked for a "home" directory, which from memory you can change in the options, its just a directory where it stores a password list and a few config files. Mark
Re: WinCvs users - query
On Wed, 24 May 2000, Win32 M$ wrote: with the standard edit box (multiline). The only difference that it makes would be that: If you do change it PLEASE make it use Courier New 10pt (of whatever is selected for use in the log window, and make it bigger, so that I one could fit 80 columns of text in the window, and have it wordwrap the display. Mark
Re: some question about gCVS.
On Tue, 23 May 2000, David Penn wrote: what's the schedule for gCVS now? i am eagar for a full feature counterpart of winCVS. I would love to run/try gCVS only my box has TCL 8.0 not 8.1, is there anything that makes it 8.1 specific?
Re: WinCVS: select in many dirs
On Fri, 19 May 2000, Dimitrie O. Paun wrote: How can one select several files (using WinCVS) in different directories such that I can commit them at once. This is very important for me, because it is quite often the case that a functional change spreads over several files in different directories, and when I check it in, I will like to check all files like a logical unit of work. I could see some kind of 'tagged' state working for this, tag status is persistant accross directories, then you could do "commit selection" or "commit tagged files", preferably, if committing tagged files a dialog came up with a list of files that are going to be committed/diffed/updated so you can check you dont have something accidentally tagged from another session or something. You could have an optional flag to untag the files on successful compleation of action, or leave tagged. Not sure how hard something like this would be to implement thou. Mark
RE: Help with client/server CVS and interoperability with NT/98
On Fri, 12 May 2000, Dennis Jones wrote: I believe you are mistaken here. The :ext: method specifies using an external rsh command, but :server: specifies CVS's internal rsh protocol: I wonder, there's often alot of discussoin about how to get WinCVS to work with SSH, what would the possibility of linking the OpenSSH project into CVS? Just as CVS has an internal rsh protocol, could an internal ssh protocol be implemented? Mark
Re: WinCvs users - gathering .cvsignore
On Wed, 3 May 2000, Dave Sherohman wrote: Ignore: *.~* *.obj Delphi 5 seems to have changed it's backup files to being .dfm~ and .pas~ so maybe *.???~ should also be here. Mark
Re: Integrating CVS to Nautilis (fwd)
On Mon, 17 Apr 2000, Todd A. Lyons wrote: I think something like that would be good. It would be even better if it could retain a single command line at the bottom (similar to xchat and autocad) where you can retain full command line functionality in addition to the slick graphics interface. Sounds good, from what I understand of the development of Nautilis and Bonobo components is that you'd say implement a CVSFolderView object (I'm guessing here) and you'd be able to extend that to include whatever you wanted such as a command line, although if you were wanting some more specific functionality you could just open an xterm. At the moment I'm usually only using WinCVS 1.1b12 at work for my Windows development and command line cvs at home under linux. Although I just instaled Pharmacy 0.2.1 but it's currently rather lacking. Out of curiosity, what do most other linux people on info-cvs use, command line cvs or one of the graphical clients? I briefly looked at TkCVS but it didn't seem to impress me much, whats Cervisia like these days? Mark
WinCVS Delete Revisions option.
I just noticed under the Graphs menu of WinCVS (1.1b12) that theres a 'delete revisions' item. Is this as destructive as it really sounds? I noticed I could select a revision in the middle of a group of revisions and delete was enabled, could be dangerous if you ask me. -- Mark Derricutt "People in prayer for me, everyone there for me, ICQ: 1934853 sometimes I feel I should face this alone, my Wrk: 377-9941 soul exposed... it calm's me to know that I Fax: 377-9947 won't!" = Dream Theater - Scarred DDI: 375-3754 Now Playing: Steve Vai - Jibboom
Re: Disk space usage (was: Re: UNIX version doesn't handle ^M in Entries/Repository if DOS ver used)
On Mon, 10 Apr 2000, Noel L Yap wrote: This sounds like a really good idea -- it sounds like a fairly minor change to the source (at least on the surface). I'd opt for gzip/gunzip since it's already distributed as part of the source. How would you intend to define which files were compressed? Would you envisage it as being repository wide (any files that are not compressed get compressed upon next commit) or per file basis, such as adding a 'z' optoin to -k such as -kz or -kbz. You would also need to define a level of compression would you not? Would the compression/decompression add much load to the system at all, I could imagine some large repositories it could become rather sluggish. Mark
Re: How to generate a ChangeLog file from CVS?
On Mon, 10 Apr 2000, Ronald Henderson wrote: http://www.red-bean.com/~kfogel/cvs2cl.shtml I was wondering if there's a ChangeLog script available that works under NT/95 against a pserver? Mark
Branch Logs
Is it possible to get a list of commit logs of ALL files on a branch? I was thinking that when I merge the changes from my branch onto the main truck I want to make the log message the collation of all log messages from that branch, is that possible? -- Mark Derricutt "People in prayer for me, everyone there for me, ICQ: 1934853 sometimes I feel I should face this alone, my Wrk: 377-9941 soul exposed... it calm's me to know that I Fax: 377-9947 won't!" = Dream Theater - Scarred DDI: 375-3754 Now Playing: Moonspell - The Butterfly Efect
Very mind
Ignore my last post, call me stupid :P -- Mark Derricutt "People in prayer for me, everyone there for me, ICQ: 1934853 sometimes I feel I should face this alone, my Wrk: 377-9941 soul exposed... it calm's me to know that I Fax: 377-9947 won't!" = Dream Theater - Scarred DDI: 375-3754 Now Playing: Moonspell - The Butterfly Efect
loginfo and branch based emails...
Hi, currently I have all commit messages being emailed to the global software group, but I only really want commits on the main branch to be emailed (so that individual branch updates don't annoying people), is there anyway to get cvs to only email the commit details if the commit was on the HEAD branch? -- Mark Derricutt "People in prayer for me, everyone there for me, ICQ: 1934853 sometimes I feel I should face this alone, my Wrk: 377-9941 soul exposed... it calm's me to know that I Fax: 377-9947 won't!" = Dream Theater - Scarred DDI: 375-3754 Now Playing: Groove Armada - At The River
