I am currently using version 1.9.1 and I have this problem: I have two versions of the same cvs module (say tagged with VER_1 and VER_2). VER_2 contains some changed files (compared to VER_1) but also some NEW files (that were first checked in as VER_2). In this case, without checking the 'default to head' checkbox I actually get "-f" passed to cvs. If I don't check "default to head" I only get a blank page. More, looking into my web server's log file I see an error message, showing a sql constraint violation (the revision field from deltas gets to be null).
So, all in all I have two questions:
- was codestriker ever supposed to work in such situations (having files added or removed between the start end end revisions). If not, are there plans for that ?
- is 'default to head' correctly implemented (and if so, what am I missing) ?
Thanks a lot !
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
I am surprised to hear about the sql constraint problems - could you paste the error messages here?
At the end of the day - the limitation here is with CVS, not codestriker.
If you can tell me the CVS command that needs to be executed in order to run rdiff between VER_1 and VER_2 which shows new/removed files, I'll gladly put this into Codestriker. It seems that CVS doesn't support this however.
Cheers,
David
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
Ok, so can you please explain the CVS problem to me (apparently I'm missing it). Oh, and about the 'Default to head' checkbox, it appears to me that it does exactly the opposite action. Well, I'm tired. Am I missing that too ?
Thanks in advance.
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
This is interesting... what version of cvs are you using? Perhaps in the latest versions, they are now supporting the diffing of new/removed files.
Can you email me an example output from your cvs rdiff command with a new file in it? Once you do that, I'll modify the file parsers, and we should be right.
Email me the diff as an attachment to:
sits@users.sourceforge.net.
Thanks.
Cheers,
David
If you would like to refer to this comment somewhere else in this project, copy and paste the following link:
Hello Codestriker gurus,
I am currently using version 1.9.1 and I have this problem: I have two versions of the same cvs module (say tagged with VER_1 and VER_2). VER_2 contains some changed files (compared to VER_1) but also some NEW files (that were first checked in as VER_2). In this case, without checking the 'default to head' checkbox I actually get "-f" passed to cvs. If I don't check "default to head" I only get a blank page. More, looking into my web server's log file I see an error message, showing a sql constraint violation (the revision field from deltas gets to be null).
So, all in all I have two questions:
- was codestriker ever supposed to work in such situations (having files added or removed between the start end end revisions). If not, are there plans for that ?
- is 'default to head' correctly implemented (and if so, what am I missing) ?
Thanks a lot !
I am surprised to hear about the sql constraint problems - could you paste the error messages here?
At the end of the day - the limitation here is with CVS, not codestriker.
If you can tell me the CVS command that needs to be executed in order to run rdiff between VER_1 and VER_2 which shows new/removed files, I'll gladly put this into Codestriker. It seems that CVS doesn't support this however.
Cheers,
David
Hi and thanks for the quick feedback.
Here's what I get from CVS when running
cvs -q rdiff -u -r VER_1 -r VER_2 module
for the particular file that was added in VER_2:
Index: module/file.c
diff -u nul module/file.c:1.1
--- nul Wed Mar 22 18:25:00 2006
followed by the content of file.c (all lines preceeded by '+').
cvs -q rdiff -u -r lnk2006_03_14_v1_3_78 -r liblnk2006_03_21_v1_0_0 linker/scooby/src
Index: linker/scooby/src/liblnk.c
diff -u nul linker/scooby/src/liblnk.c:1.1
--- nul Wed Mar 22 18:25:00 2006
Here's the error message.
codestriker.pl: DBD::mysql::st execute failed: Column 'revision' cannot be null at /var/www/codestriker/bin/../lib/Codestriker/Model/File.pm line 48., referer: http://gomi.ea.freescale.net/codestriker/codestriker.pl?action=create
Ok, so can you please explain the CVS problem to me (apparently I'm missing it). Oh, and about the 'Default to head' checkbox, it appears to me that it does exactly the opposite action. Well, I'm tired. Am I missing that too ?
Thanks in advance.
This is interesting... what version of cvs are you using? Perhaps in the latest versions, they are now supporting the diffing of new/removed files.
Can you email me an example output from your cvs rdiff command with a new file in it? Once you do that, I'll modify the file parsers, and we should be right.
Email me the diff as an attachment to:
sits@users.sourceforge.net.
Thanks.
Cheers,
David