Re: [viewvc-users] Colored diff not working
"C. Michael Pilato" <[email protected]> Wed, 19 Sep 2012 22:56:48 -0700
| Newsgroups | gmane.comp.version-control.cvs.viewcvs.user |
|---|---|
| Organization | CollabNet, Inc. |
| Message-ID | <[email protected]> |
Your mail was hard to read ... got kinda butchered somewhere between your MUA and mine. It definite appears that ViewVC is trying to use the native Solaris 'diff' tool, which is *not* GNU diff. This could be because 'rcsdiff' was compiled to invoke 'diff' at a particular path location, and it's the Solaris 'diff' that's sitting at that location. If that's the case, no amount of fiddling with $PATH will matter. You might consider flipping the use_rcsparse option to '1', which will cause ViewVC to use its own Python-based RCS backing file parser and your configured GNU diff binary instead of using the RCS toolchain. On 09/19/2012 08:11 AM, Médérick Thebault wrote: > <html> > <head> > > <meta http-equiv="content-type" content="text/html; charset=ISO-8859-1"> > </head> > <body bgcolor="#FFFFFF" text="#000000"> > Good afternoon,<br> > <br> > Thanx for your work on this nice tool. I am using it and face a > problem after update to last version.<br> > <br> > Solaris 10<br> > ViewVC 1.1.15<br> > diff GNU diffutils 3.2<br> > CVS<br> > GNU rcs 5.8<br> > <br> > I updated viewvc.conf section for diff (and cvsgraph) and set it to > /usr/local/bin/diff. I also added at the begining of $PATH > /usr/local/bin<br> > <br> > The cvsgraph is working.<br> > <br> > The diff is working fine with unidiff ad contextdiff, but not for > the rest. <br> > <br> > If I select <br> > - side by side I got > <pre class="vc_raw_diff">/usr/bin/diff: illegal option -- side-by-side</pre> > which is not the same path as the one in the conf file.<br> > <br> > - colored I got :<br> > <br> > <strong>ViewVC depends on rcsdiff and GNU diff to create > this page. ViewVC cannot find GNU diff. Even if you > have GNU diff installed, the rcsdiff program must be > configured and compiled with the GNU diff location. > -</strong><br> > <br> > Does someone has any tip on what I have done wrong?<br> > <br> > Regards,<br> > <br> > MT<br> > </body> > </html> > > <table><tr><td bgcolor=#ffffff><font color=#000000><pre><table> > <div style="width:60%;"> > <hr> > </div> > <p style="font-size:10px; font-family:Verdana;line-height:10px;color:grey;"> > <b>Bretagne Angleterre Irlande (Groupe Brittany Ferries - Serestel)</b><BR><BR> > Siège social : Port du Bloscon BP 72 29688 Roscoff cedex France - Tél + 33 2 98 29 28 00 - Fax + 33 2 98 29 27 00<BR> > Société Anonyme à directoire et conseil de surveillance au capital de 22.831.056 €<BR> > RCS Brest 927 250 217 - Code APE 5010Z - Registre des Opérateurs de Voyages et de Séjours N° IMO29100011<BR><BR> > > Ce message et toutes les pièces jointes peuvent contenir des informations confidentielles à l'intention exclusive de ses destinataires.<BR> > Si vous le recevez par erreur, merci de bien vouloir nous en informer, et le supprimer.<BR> > This message and any attachments may contain confidential information for the intended recipient only.<BR> > If you have received it in error, please contact us, and delete it.<BR> > </p> > <div style="width:60%;"> > <hr> > </div> > </table></pre></font></td></tr></table> > > ------------------------------------------------------ > http://viewvc.tigris.org/ds/viewMessage.do?dsForumId=4255&dsMessageId=3007127 > > To unsubscribe from this discussion, e-mail: [[email protected]]. > -- C. Michael Pilato <[email protected]> CollabNet <> www.collab.net <> Enterprise Cloud Development ------------------------------------------------------ http://viewvc.tigris.org/ds/viewMessage.do?dsForumId=4255&dsMessageId=3007272 To unsubscribe from this discussion, e-mail: [[email protected]].
signature.asc
(application/pgp-signature, 198 B)
-----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iEYEARECAAYFAlBasCAACgkQokEGqRcG/W76uwCfQm4w3/I3jcF/noehPWQrOi/t AjwAniiDlOf4+xX54QDV5RV9tKqO1ukQ =/Fjn -----END PGP SIGNATURE-----