Hi Matthew,
For any new files, the user needs to do a "cvs add <filename>" first. This
doesn't add the file to CVS yet, it just marks it, so the diff command
will pick it up.
When you do a "cvs diff -uN", these new files will be marked with a "+" on
all their new lines.
Likewise, for all files to be removed, the user needs to do a "cvs remove
<filename>" first. Removed files will have a "-" on all lines.
Cheers,
David
On Tue, 27 Jan 2004 02:36, Matthew Hailstone wrote:
> This is what I'm trying to do:
>
> I'm generating a .diff file with a custom utility I've written. I let
> the user add any path or file to a list that I eventually run the "cvs
> diff" command on.
>
> The following is a sample output:
>
> Index: .project
> ===================================================================
> RCS file: /cvs/test/.project,v
> retrieving revision 1.2
> diff -u -r1.2 .project
> --- .project 22 Jan 2004 18:28:31 -0000 1.2
> +++ .project 23 Jan 2004 22:54:15 -0000
> @@ -7,6 +7,11 @@
> </projects>
> <buildSpec>
> <buildCommand>
> + <name>com.atlassw.tools.eclipse.checkstyle.CheckstyleBuilder</name>
> + <arguments>
> + </arguments>
> + </buildCommand>
> + <buildCommand>
> <name>org.eclipse.jdt.core.javabuilder</name>
> <arguments>
> </arguments>
> @@ -14,5 +19,6 @@
> </buildSpec>
> <natures>
> <nature>org.eclipse.jdt.core.javanature</nature>
> +
> <nature>com.atlassw.tools.eclipse.checkstyle.CheckstyleNature</nature>
> </natures>
> </projectDescription>
> Index: .checkstyle
> ===================================================================
> <?xml version="1.0" encoding="UTF-8"?>
> <fileset-config file-format-version="1.0.0">
> <fileset name="Test" enabled="true"
> check-config-name="TestCodeStyle">
> <file-match-pattern match-pattern="[.java]$"
> include-pattern="true"/>
> </fileset>
> </fileset-config>
>
> I am trying to include new files (not added to the CVS repository yet),
> as well as committed files to a topic.
> The .project file is a committed file that has changes.
> The .checkstyle file is a new file that is unknown to CVS. (I'm
> obviously experimenting with what syntax to create above. :)
> The complete contents of the new file would come under the
>
> Index: <filename>
> ===================================================================
>
> header.
>
> Is there a way to include a new file in a diff file to upload when
> creating a new topic? Then, all files
>
> Regards!
>
> Matthew
>
> *************************************
> This e-mail may contain privileged or confidential material intended for
> the named recipient only. If you are not the named recipient, delete
> this message and all attachments. Unauthorized reviewing, copying,
> printing, disclosing, or otherwise using information in this e-mail is
> prohibited. We reserve the right to monitor e-mail sent through our
> network. *************************************
--
Cheers,
David
|