You are viewing a plain text version of this content. The canonical link for it is here.
Posted to general@jakarta.apache.org by Tetsuya Kitahata <te...@nifty.ne.jp> on 2002/09/23 09:43:30 UTC

[PATCH] how to create unified diffs with WinCVS (bugs.xml, source.xml)

Hi, All.

This patch is for the additional commments on the creation
of unified diffs using WinCVS to jakarta-site2/xdocs/site/bugs.xml
and jakarta-site2/xdocs/site/source.xml. 

I think this FAQ will encourage the Windows users/developers.

Best Regards,
Tetsuya.


-----------------------------------------------------------------------

Index: bugs.xml
===================================================================
RCS file: /home/cvspublic/jakarta-site2/xdocs/site/bugs.xml,v
retrieving revision 1.8
diff -u -r1.8 bugs.xml
--- bugs.xml	22 Jul 2002 01:48:48 -0000	1.8
+++ bugs.xml	23 Sep 2002 05:57:47 -0000
@@ -47,7 +47,14 @@
 "patchfile.txt" but instead call it "foo-concurrency.txt". This makes it easier
 for developers who need to apply a number of different patches.
 </p>
-
+<p>
+Note: If you use <a href="http://www.wincvs.org/">WinCVS</a>, move to 
+[Admin] -&gt; [Command Line] Menu and type "cvs diff -u" at 
+[Enter a cvs line command] input field ([Commandline Settings] Tab), 
+while selecting the target directories or files, in order to create 
+unified diffs.
+In other words, [Alt+A]+[Alt+C]+[Alt+C] and type "cvs diff -u".
+</p>
 <p>
 See the <a href="./source.html">guidelines</a> section of our site for more 
 details. 
Index: source.xml
===================================================================
RCS file: /home/cvspublic/jakarta-site2/xdocs/site/source.xml,v
retrieving revision 1.10
diff -u -r1.10 source.xml
--- source.xml	21 Aug 2002 02:17:40 -0000	1.10
+++ source.xml	23 Sep 2002 05:57:47 -0000
@@ -173,6 +173,15 @@
   </p>
 
   <p>
+  Note: If you use <a href="http://www.wincvs.org/">WinCVS</a>, move to 
+  [Admin] -&gt; [Command Line] Menu and type "cvs diff -u" at 
+  [Enter a cvs line command] input field ([Commandline Settings] Tab), 
+  while selecting the target directories or files, in order to create 
+  unified diffs. 
+  In other words, [Alt+A]+[Alt+C]+[Alt+C] and type "cvs diff -u".
+  </p>
+
+  <p>
   All patches necessary to address an action item should be
   concatencated within a single patch message. If later modification
   to the patch proves necessary, the entire new patch should be posted

-----------------------------------------------------------------------

------------------------------------------------------
Tetsuya Kitahata        President of Terra International, Inc.
E-mail: kitahata@bb.mbn.or.jp  URL : http://www.terra-intl.com/
(BASP21 Pro)      http://www.terra-intl.com/basp21/
(Jakarta no mori) http://www.terra-intl.com/jakarta/


--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


Re: [PATCH] how to create unified diffs with WinCVS (bugs.xml, source.xml)

Posted by Tetsuya Kitahata <te...@nifty.ne.jp>.
On Mon, 23 Sep 2002 08:26:15 -0400
"Andrew C. Oliver" <an...@superlinksoftware.com> wrote:

> >I think this FAQ will encourage the Windows users/developers.
> Despite that threat ;-) I'll apply it tomorrow if someone doesn't beat 
> me to it.  Tonight I've
> this:  http://www.trijug.org/shootoutMeeting.html

I've thought that this FAQ would reduce Andy's headaches ;-)

> I only wish Jon could come and moderate ;-)
>
> - Andy

Best Regards,
Tetsuya.


------------------------------------------------------
Tetsuya Kitahata        President of Terra International, Inc.


--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>


Re: [PATCH] how to create unified diffs with WinCVS (bugs.xml, source.xml)

Posted by "Andrew C. Oliver" <an...@superlinksoftware.com>.
>
>
>I think this FAQ will encourage the Windows users/developers.
>  
>
Despite that threat ;-) I'll apply it tomorrow if someone doesn't beat 
me to it.  Tonight I've
this:  http://www.trijug.org/shootoutMeeting.html

I only wish Jon could come and moderate ;-)

-Andy

>Best Regards,
>Tetsuya.
>
>
>-----------------------------------------------------------------------
>
>Index: bugs.xml
>===================================================================
>RCS file: /home/cvspublic/jakarta-site2/xdocs/site/bugs.xml,v
>retrieving revision 1.8
>diff -u -r1.8 bugs.xml
>--- bugs.xml	22 Jul 2002 01:48:48 -0000	1.8
>+++ bugs.xml	23 Sep 2002 05:57:47 -0000
>@@ -47,7 +47,14 @@
> "patchfile.txt" but instead call it "foo-concurrency.txt". This makes it easier
> for developers who need to apply a number of different patches.
> </p>
>-
>+<p>
>+Note: If you use <a href="http://www.wincvs.org/">WinCVS</a>, move to 
>+[Admin] -&gt; [Command Line] Menu and type "cvs diff -u" at 
>+[Enter a cvs line command] input field ([Commandline Settings] Tab), 
>+while selecting the target directories or files, in order to create 
>+unified diffs.
>+In other words, [Alt+A]+[Alt+C]+[Alt+C] and type "cvs diff -u".
>+</p>
> <p>
> See the <a href="./source.html">guidelines</a> section of our site for more 
> details. 
>Index: source.xml
>===================================================================
>RCS file: /home/cvspublic/jakarta-site2/xdocs/site/source.xml,v
>retrieving revision 1.10
>diff -u -r1.10 source.xml
>--- source.xml	21 Aug 2002 02:17:40 -0000	1.10
>+++ source.xml	23 Sep 2002 05:57:47 -0000
>@@ -173,6 +173,15 @@
>   </p>
> 
>   <p>
>+  Note: If you use <a href="http://www.wincvs.org/">WinCVS</a>, move to 
>+  [Admin] -&gt; [Command Line] Menu and type "cvs diff -u" at 
>+  [Enter a cvs line command] input field ([Commandline Settings] Tab), 
>+  while selecting the target directories or files, in order to create 
>+  unified diffs. 
>+  In other words, [Alt+A]+[Alt+C]+[Alt+C] and type "cvs diff -u".
>+  </p>
>+
>+  <p>
>   All patches necessary to address an action item should be
>   concatencated within a single patch message. If later modification
>   to the patch proves necessary, the entire new patch should be posted
>
>-----------------------------------------------------------------------
>
>------------------------------------------------------
>Tetsuya Kitahata        President of Terra International, Inc.
>E-mail: kitahata@bb.mbn.or.jp  URL : http://www.terra-intl.com/
>(BASP21 Pro)      http://www.terra-intl.com/basp21/
>(Jakarta no mori) http://www.terra-intl.com/jakarta/
>
>
>--
>To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
>For additional commands, e-mail: <ma...@jakarta.apache.org>
>
>
>  
>




--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>