Community
Participate
Working Groups
Create a template to be used by developers as they check in code. I am willing to help work on this. Create a template for example: SCR: Tester: Test script: Description:
There's already a commit template support in CVS. If you configure the server correctly Eclipse will show the template provided by the server. See the CVS docs on how to setup your template.
I do have a cvs template and am using a pserver connection. The template is not used when I check a file in. Is there something special that needs to be done?
Does the template work with the command line client?
I do not have a command line client on the PC but it does work properly on UNIX. My cvs server is on an SGI.
What server version are you using? Please follow the steps at the following URL to get a trace of the client to server communicatons: http://dev.eclipse.org/viewcvs/index.cgi/%7Echeckout%7E/platform-vcm- home/docs/online/cvs_features2.0/cvs-faq.html#misc_0
Michael, This is what I get. *** cvs -r ci -m "SCR000 - Got rid of Compiler warnings - uncessary casts and do nothing semi-colons." "/agps/boeing/agps/commands/CbfCmd.java" Checking in boeing/agps/commands/CbfCmd.java; /acct/agps/cvs/AGPS/boeing/agps/commands/CbfCmd.java,v <-- CbfCmd.java new revision: 1.12; previous revision: 1.11 done ok (took 0:00.211) I'm using version 1.11.6
Actually, it's the checkout and update that download the template from the server. Could you perform one of those operations and attach the trace.
Michael, here is the output from an update. *** cvs -r update -d -P "/agps/boeing/agps/commands/CbfCmd.java" ok (took 0:00.030) *** But you understand that it is the checkin template (rcstemplate) that I am interested in. My template looks like the following: ^AGPS* $CVSROOT/CVSROOT/rcstemplate ^CVSROOT* $CVSROOT/CVSROOT/rcstemplate ^agpstools* $CVSROOT/CVSROOT/rcstemplate ^packages* $CVSROOT/CVSROOT/rcstemplate /acct/agps/cvs/CVSROOT> cat rcstemplate SCR/SPR : Tested by : Testing vehicle : Description : CVS: ---------------------------------------------------------------------- CVS: Use append to add to the above lines, when you quit the editor your CVS: inputs will be checked for completeness. Each field needs to be CVS: input CVS: The lines starting with CVS are comments and will be deleted from the CVS: log file. Just enter the above information. Below is a description CVS: of the fields CVS: SCR/SPR: CVS: Needs to be in the form GCHxxxx or SPRyyyy where xxxx and yyy refer to CVS: the corresponding numbers CVS: Tested by: CVS: Enter the person who tested this change - Initials of tester OK CVS: If there is no tester or you are the tester enter "self" CVS: Test vehicle: CVS: Enter none, coverage, smoke-test, or script name CVS: Description: CVS: Enter a brief description of the change. Multiple lines OK. CVS: Remember people may read these comments a year from now - don't be too brief! /acct/agps/cvs
Sorry. I need the output that was written to the console you used to launch Eclipse. You may need to go into the Window>Preferences/Team>CVS preferences and enable the option to display detail protocol output to stdout.
Nothing is written to the PC console from eclipse. I do have the output to stdout checked. Here is the bat file that I use to run eclipse: C:\eclipse3.0\eclipse\eclipse.exe -data c:\EclipseWorkspace -vm "C:\Program Files\java\j2re1.4.2_01\bin\javaw" -debug -consolelog
You need to use the "java" executable and not "javaw".
Michael, Sorry my shortcut and bat files were not in sync. Here is the debug after an update: Using the installation directory. Startup: using configuration file:C:/eclipse3.0/update1107/eclipse/.config/platf orm.cfg Boot URL: file:C:/eclipse3.0/update1107/eclipse/plugins/org.eclipse.core.boot_3. 0.0/boot.jar Startup: splash path = C:\eclipse3.0\update1107\eclipse\plugins\org.eclipse.plat form_3.0.0\splash.bmp Workspace location: c:\EclipseWorkspace Debug-Options: file:C:/Documents and Settings/slr6053/Desktop/.options Install URL: file:C:/eclipse3.0/update1107/eclipse/ I LOVE YOU Valid-responses ok error M E Checked-in Valid-requests Template Set-sticky MT Cl ear-static-directory Module-expansion Set-static-directory Clear-sticky New-entr y Merged Removed Updated Remove-entry Update-existing Copy-file Created Notified Mod-time valid-requests Valid-requests Root Valid-responses valid-requests Repository Directory Max-dotd ot Static-directory Sticky Entry Kopt Checkin-time Modified Is-modified UseUncha nged Unchanged Notify Questionable Case Argument Argumentx Global_option Gzip-st ream wrapper-sendme-rcsOptions Set expand-modules ci co update diff log rlog add remove update-patches gzip-file-contents status rdiff tag rtag import admin exp ort history release watch-on watch-off watch-add watch-remove watchers editors i nit annotate rannotate noop version ok Root /acct/agps/cvs CMD> cvs -r version Global_option -r version M Concurrent Versions System (CVS) 1.11.6 (client/server) ok RESULT> Status OKorg.eclipse.team.cvs.core code=0 ok null CMD> cvs -r update -d -P "/agps/boeing/agps/commands/AbcCmd.java" Global_option -r Argument -d Argument -P Directory boeing/agps/commands /acct/agps/cvs/AGPS/boeing/agps/commands Entry /AbcCmd.java/1.27/// Unchanged AbcCmd.java Argument boeing/agps/commands/AbcCmd.java Directory . /acct/agps/cvs/CVSROOT/Emptydir update MT +updated MT text U MT fname boeing/agps/commands/AbcCmd.java MT newline MT -updated Update-existing boeing/agps/commands/ /acct/agps/cvs/AGPS/boeing/agps/commands/AbcCmd.java /AbcCmd.java/1.28/// u=r,g=r,o= 11806 ok RESULT> Status OKorg.eclipse.team.cvs.core code=0 ok null
Sorry about this. I need you to do a checkout to see if the template is being sent. With an update, sometimes it is sent and sometimes it isn't. A checkout will show wether it is being sent or not.
Here it is: Argument AgpsObject.java Argument Curve.java Argument Geometric.java Argument NonGeometric.java Argument Parametric.java Argument Point.java Argument Points.java Argument Solid.java Argument StructuredPoints.java Argument Surface.java Argument UnstructuredPoints.java Argument gadget.java Directory . /acct/agps/cvs/AGPS/boeing/agps/types/interfaces status E cvs server: conflict: AgpsObject.java created independently by second party M =================================================================== M File: AgpsObject.java Status: Unresolved Conflict M M Working revision: New file! M Repository revision: 1.9 /acct/agps/cvs/AGPS/boeing/agps/types/in terfaces/AgpsObject.java,v M Sticky Tag: (none) M Sticky Date: (none) M Sticky Options: (none) M E cvs server: conflict: Curve.java created independently by second party M =================================================================== M File: Curve.java Status: Unresolved Conflict M M Working revision: New file! M Repository revision: 1.2 /acct/agps/cvs/AGPS/boeing/agps/types/in terfaces/Curve.java,v M Sticky Tag: (none) M Sticky Date: (none) M Sticky Options: (none) M E cvs server: conflict: Geometric.java created independently by second party M =================================================================== M File: Geometric.java Status: Unresolved Conflict M M Working revision: New file! M Repository revision: 1.4 /acct/agps/cvs/AGPS/boeing/agps/types/in terfaces/Geometric.java,v M Sticky Tag: (none) M Sticky Date: (none) M Sticky Options: (none) M E cvs server: conflict: NonGeometric.java created independently by second party M =================================================================== M File: NonGeometric.java Status: Unresolved Conflict M M Working revision: New file! M Repository revision: 1.2 /acct/agps/cvs/AGPS/boeing/agps/types/in terfaces/NonGeometric.java,v M Sticky Tag: (none) M Sticky Date: (none) M Sticky Options: (none) M E cvs server: conflict: Parametric.java created independently by second party M =================================================================== M File: Parametric.java Status: Unresolved Conflict M M Working revision: New file! M Repository revision: 1.3 /acct/agps/cvs/AGPS/boeing/agps/types/in terfaces/Parametric.java,v M Sticky Tag: (none) M Sticky Date: (none) M Sticky Options: (none) M E cvs server: conflict: Point.java created independently by second party M =================================================================== M File: Point.java Status: Unresolved Conflict M M Working revision: New file! M Repository revision: 1.3 /acct/agps/cvs/AGPS/boeing/agps/types/in terfaces/Point.java,v M Sticky Tag: (none) M Sticky Date: (none) M Sticky Options: (none) M E cvs server: conflict: Points.java created independently by second party M =================================================================== M File: Points.java Status: Unresolved Conflict M M Working revision: New file! M Repository revision: 1.3 /acct/agps/cvs/AGPS/boeing/agps/types/in terfaces/Points.java,v M Sticky Tag: (none) M Sticky Date: (none) M Sticky Options: (none) M E cvs server: conflict: Solid.java created independently by second party M =================================================================== M File: Solid.java Status: Unresolved Conflict M M Working revision: New file! M Repository revision: 1.2 /acct/agps/cvs/AGPS/boeing/agps/types/in terfaces/Solid.java,v M Sticky Tag: (none) M Sticky Date: (none) M Sticky Options: (none) M E cvs server: conflict: StructuredPoints.java created independently by second pa rty M =================================================================== M File: StructuredPoints.java Status: Unresolved Conflict M M Working revision: New file! M Repository revision: 1.4 /acct/agps/cvs/AGPS/boeing/agps/types/in terfaces/StructuredPoints.java,v M Sticky Tag: (none) M Sticky Date: (none) M Sticky Options: (none) M E cvs server: conflict: Surface.java created independently by second party M =================================================================== M File: Surface.java Status: Unresolved Conflict M M Working revision: New file! M Repository revision: 1.2 /acct/agps/cvs/AGPS/boeing/agps/types/in terfaces/Surface.java,v M Sticky Tag: (none) M Sticky Date: (none) M Sticky Options: (none) M E cvs server: conflict: UnstructuredPoints.java created independently by second party M =================================================================== M File: UnstructuredPoints.java Status: Unresolved Conflict M M Working revision: New file! M Repository revision: 1.3 /acct/agps/cvs/AGPS/boeing/agps/types/in terfaces/UnstructuredPoints.java,v M Sticky Tag: (none) M Sticky Date: (none) M Sticky Options: (none) M E cvs server: conflict: gadget.java created independently by second party M =================================================================== M File: gadget.java Status: Unresolved Conflict M M Working revision: New file! M Repository revision: 1.1 /acct/agps/cvs/AGPS/boeing/agps/types/in terfaces/gadget.java,v M Sticky Tag: (none) M Sticky Date: (none) M Sticky Options: (none) M ok RESULT> Status WARNINGorg.eclipse.team.cvs.core code=1 The following warnings we re reported while performing the "cvs status" command. null children=[Status WAR NINGorg.eclipse.team.cvs.core code=-12 cvs server: conflict: AgpsObject.java cre ated independently by second party null Status WARNINGorg.eclipse.team.cvs.core code=-12 cvs server: conflict: Curve.java created independently by second party null Status WARNINGorg.eclipse.team.cvs.core code=-12 cvs server: conflict: Geom etric.java created independently by second party null Status WARNINGorg.eclipse. team.cvs.core code=-12 cvs server: conflict: NonGeometric.java created independe ntly by second party null Status WARNINGorg.eclipse.team.cvs.core code=-12 cvs s erver: conflict: Parametric.java created independently by second party null Stat us WARNINGorg.eclipse.team.cvs.core code=-12 cvs server: conflict: Point.java cr eated independently by second party null Status WARNINGorg.eclipse.team.cvs.core code=-12 cvs server: conflict: Points.java created independently by second part y null Status WARNINGorg.eclipse.team.cvs.core code=-12 cvs server: conflict: So lid.java created independently by second party null Status WARNINGorg.eclipse.te am.cvs.core code=-12 cvs server: conflict: StructuredPoints.java created indepen dently by second party null Status WARNINGorg.eclipse.team.cvs.core code=-12 cvs server: conflict: Surface.java created independently by second party null Statu s WARNINGorg.eclipse.team.cvs.core code=-12 cvs server: conflict: UnstructuredPo ints.java created independently by second party null Status WARNINGorg.eclipse.t eam.cvs.core code=-12 cvs server: conflict: gadget.java created independently by second party null] I LOVE YOU Valid-responses ok error M E Checked-in Valid-requests Template Set-sticky Clear -static-directory Module-expansion Set-static-directory Clear-sticky New-entry M erged Removed Updated Remove-entry Update-existing Copy-file Created Notified Mo d-time valid-requests Valid-requests Root Valid-responses valid-requests Repository Directory Max-dotd ot Static-directory Sticky Entry Kopt Checkin-time Modified Is-modified UseUncha nged Unchanged Notify Questionable Case Argument Argumentx Global_option Gzip-st ream wrapper-sendme-rcsOptions Set expand-modules ci co update diff log rlog add remove update-patches gzip-file-contents status rdiff tag rtag import admin exp ort history release watch-on watch-off watch-add watch-remove watchers editors i nit annotate rannotate noop version ok Root /acct/agps/cvs CMD> cvs -r co -d "interfaces3" -P -A "/AGPS/boeing/agps/types/interfaces" Argument AGPS/boeing/agps/types/interfaces expand-modules Module-expansion AGPS/boeing/agps/types/interfaces ok Global_option -r Argument -d Argument interfaces3 Argument -P Argument -A Argument AGPS/boeing/agps/types/interfaces Directory . /acct/agps/cvs/ co Clear-sticky interfaces3/ /acct/agps/cvs/AGPS/boeing/agps/types/interfaces/ Template interfaces3/ /acct/agps/cvs/AGPS/boeing/agps/types/interfaces/ 983 Clear-static-directory interfaces3/ /acct/agps/cvs/AGPS/boeing/agps/types/interfaces/ Clear-sticky interfaces3/ /acct/agps/cvs/AGPS/boeing/agps/types/interfaces/ E cvs server: Updating interfaces3 Mod-time 3 Sep 2003 17:30:21 -0000 M U interfaces3/AgpsObject.java Created interfaces3/ /acct/agps/cvs/AGPS/boeing/agps/types/interfaces/AgpsObject.java /AgpsObject.java/1.9/// u=r,g=r,o=r 10846 Mod-time 14 Jun 2003 23:15:36 -0000 M U interfaces3/Curve.java Created interfaces3/ /acct/agps/cvs/AGPS/boeing/agps/types/interfaces/Curve.java /Curve.java/1.2/// u=r,g=r,o=r 161 Mod-time 15 Aug 2003 00:36:52 -0000 M U interfaces3/Geometric.java Created interfaces3/ /acct/agps/cvs/AGPS/boeing/agps/types/interfaces/Geometric.java /Geometric.java/1.4/// u=r,g=r,o=r 1273 Mod-time 14 Jun 2003 23:15:36 -0000 M U interfaces3/NonGeometric.java Created interfaces3/ /acct/agps/cvs/AGPS/boeing/agps/types/interfaces/NonGeometric.java /NonGeometric.java/1.2/// u=r,g=r,o=r 120 Mod-time 9 Jul 2003 16:21:43 -0000 M U interfaces3/Parametric.java Created interfaces3/ /acct/agps/cvs/AGPS/boeing/agps/types/interfaces/Parametric.java /Parametric.java/1.3/// u=r,g=r,o=r 708 Mod-time 9 Jul 2003 16:21:43 -0000 M U interfaces3/Point.java Created interfaces3/ /acct/agps/cvs/AGPS/boeing/agps/types/interfaces/Point.java /Point.java/1.3/// u=r,g=r,o=r 114 Mod-time 9 Jul 2003 16:21:43 -0000 M U interfaces3/Points.java Created interfaces3/ /acct/agps/cvs/AGPS/boeing/agps/types/interfaces/Points.java /Points.java/1.3/// u=r,g=r,o=r 114 Mod-time 14 Jun 2003 23:15:36 -0000 M U interfaces3/Solid.java Created interfaces3/ /acct/agps/cvs/AGPS/boeing/agps/types/interfaces/Solid.java /Solid.java/1.2/// u=r,g=r,o=r 114 Mod-time 24 Jul 2003 22:00:10 -0000 M U interfaces3/StructuredPoints.java Created interfaces3/ /acct/agps/cvs/AGPS/boeing/agps/types/interfaces/StructuredPoints.java /StructuredPoints.java/1.4/// u=r,g=r,o=r 2705 Mod-time 14 Jun 2003 23:15:37 -0000 M U interfaces3/Surface.java Created interfaces3/ /acct/agps/cvs/AGPS/boeing/agps/types/interfaces/Surface.java /Surface.java/1.2/// u=r,g=r,o=r 316 Mod-time 23 Jul 2003 12:15:59 -0000 M U interfaces3/UnstructuredPoints.java Created interfaces3/ /acct/agps/cvs/AGPS/boeing/agps/types/interfaces/UnstructuredPoints.java /UnstructuredPoints.java/1.3/// u=r,g=r,o=r 230 Mod-time 20 Aug 2003 22:09:13 -0000 M U interfaces3/gadget.java Created interfaces3/ /acct/agps/cvs/AGPS/boeing/agps/types/interfaces/gadget.java /gadget.java/1.1/// u=r,g=r,o=r 466 Clear-sticky interfaces3/ /acct/agps/cvs/AGPS/boeing/agps/types/interfaces/ ok RESULT> Status OKorg.eclipse.team.cvs.core code=0 ok null
So it appears that the template was sent to the client and contains ~900 bytes: Template interfaces3/ /acct/agps/cvs/AGPS/boeing/agps/types/interfaces/ 983 When you do a commit, is the message dialog empty?
Yes
I should have asked this first. Is there anything in your error log (located in .metadata/.log within your workspace directory and also viewable using Window/Show View>PDE Runtime/Error Log). Also, what Eclipse build are you using.
I am currently running 3.0 but the problem also exists with 2.1. There are no errors in the log after a checkout or after a commit.
I am still unable to reproduce this failure and there doesn't appear to be anything out of the ordinary about your setup. Using the Windows file explorer, could you verify that the file named Template exists inside the CVS folder of your project directory. Also, please confirm that the contents are what you expect.
Yes the file exists and is the same as the one below. It does not exist at the project level but in each sub-directory in my tree.
Well then that's the problem. We get the commit template from the CVS folder at the project level. Are you using a sepcial project setup (e.g. linked resources, Check out info)? If you perform a commit on the example checkout you provided above (interfaces3) does the template show up in the commit dialog?
Copying the template file to my CVS directory in the project works. Not sure why it wasn't always there. Sorry for all of the email traffic.
Now that the template is in the right place - under CVS at the project level. The message that is getting put into the cvslog includes the whole template. Items begining with CVS are supposed to be stripped. They are stripped when running from standalone CVS clients. Here is a sample of the template: SCR/SPR : Tested by : Testing vehicle : Description : CVS: ---------------------------------------------------------------------- CVS: Use append to add to the above lines, when you quit the editor your CVS: inputs will be checked for completeness. Each field needs to be CVS: input CVS: The lines starting with CVS are comments and will be deleted from the CVS: log file. Just enter the above information. Below is a description CVS: of the fields CVS: SCR/SPR: CVS: Needs to be in the form GCHxxxx or SPRyyyy where xxxx and yyy refer to CVS: the corresponding numbers CVS: Tested by: CVS: Enter the person who tested this change - Initials of tester OK CVS: If there is no tester or you are the tester enter "self" CVS: Test vehicle: CVS: Enter none, coverage, smoke-test, or script name CVS: Description: CVS: Enter a brief description of the change. Multiple lines OK. CVS: Remember people may read these comments a year from now - don't be too brief!
Will try to address for 3.0 if there is time.
Mark, What is the status of this bug - See the last note about not removing lines that start with CVS. Will it get into M7
Michael, I there any chance of getting this one into 3.0? It is a pain to manually delete the CVS comments in eclipse, when all other platforms automagically delete them.
Post 3.0
This bug has not seen any activity in 2 years and there have been no other reports of similar problems. Please reopen if this is still a problem for you.
