Re: [fossil-users] [gdiff] Recommanded GUI differ for Windows?
On Wed, 21 Nov 2012 20:51:09 -0800, E. Timothy Uy t...@loqu8.com wrote: ExamDiff Pro. http://www.prestosoft.com/edp_examdiffpro.asp On Wed, Nov 21, 2012 at 7:47 PM, Tomek Kott tkott.li...@outlook.com wrote: fwiw I've used kdiff3 (http://kdiff3.sourceforge.net/) on windows with good success. It can do merges as well though I've yet to actually use that functionality Thanks for the links. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] [gdiff] Recommanded GUI differ for Windows?
BeyondCompare is by far the best diff program I have used. And: it works on Windows and Linux both. Don't have an answer for #2... I use the fossil ui if I want a contextual gui diff On 11/21/2012 03:43 PM, Gilles wrote: Hello I prefer to use a GUI differ than the text-based solution. 1. Which Windows GUI differ would you recommend for use with Fossil? I know about WinDiff and BeyondCompare. 2. How to configure the diff-binary line in Settings so that Fossil and the GUI differ work well together? How do the two filenames look like as passed by Fossil when calling the differ? ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] [gdiff] Recommanded GUI differ for Windows?
On Wed, Nov 21, 2012 at 8:43 AM, Gilles gilles.gana...@free.fr wrote: Hello I prefer to use a GUI differ than the text-based solution. 1. Which Windows GUI differ would you recommend for use with Fossil? I know about WinDiff and BeyondCompare. In newer versions of Fossil, if you do fossil gdiff on windows, it runs WinDiff by default. There is nothing to configure. Also, do you know about fossil diff --tk? The --tk option requires that you have Tcl/Tk installed on your system (which is easily accomplished at http://www.activestate.com/activetcl), but once you've crossed that hurdle, the --tk option shows you differences across multiple files, instead of just one file at a time like gdiff does. And, one may reasonably expect that the --tk option will be enhanced in the future. 2. How to configure the diff-binary line in Settings so that Fossil and the GUI differ work well together? How do the two filenames look like as passed by Fossil when calling the differ? Thank you. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users -- D. Richard Hipp d...@sqlite.org ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] [gdiff] Recommanded GUI differ for Windows?
On Wed, 21 Nov 2012 08:57:00 -0500, Richard Hipp d...@sqlite.org wrote: In newer versions of Fossil, if you do fossil gdiff on windows, it runs WinDiff by default. There is nothing to configure. So I don't need to fill the diff-command in Settings, and just adding WinDiff to Windows' PATH env't variable should be enough. I'll also give TK a try. Thank you. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] [gdiff] Recommanded GUI differ for Windows?
On Wed, 21 Nov 2012 15:18:08 +0100, Gilles gilles.gana...@free.fr wrote: So I don't need to fill the diff-command in Settings, and just adding WinDiff to Windows' PATH env't variable should be enough. ... or rather the gdiff-command. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] [gdiff] Recommanded GUI differ for Windows?
On Wed, Nov 21, 2012 at 2:43 PM, Gilles gilles.gana...@free.fr wrote: Hello I prefer to use a GUI differ than the text-based solution. 1. Which Windows GUI differ would you recommend for use with Fossil? I know about WinDiff and BeyondCompare. I might be a bit biased since I wrote it, but I prefer http://eskil.tcl.tk 2. How to configure the diff-binary line in Settings so that Fossil and the GUI differ work well together? How do the two filenames look like as passed by Fossil when calling the differ? See http://eskil.tcl.tk/index.html/doc/trunk/htdocs/fossil.wiki for an example for gmerge-command. gdiff would be: fossil settings gdiff-command 'eskil' /Peter ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] [gdiff] Recommanded GUI differ for Windows?
On Wed, 21 Nov 2012 15:37:26 +0100, Peter Spjuth peter.spj...@gmail.com wrote: I might be a bit biased since I wrote it, but I prefer http://eskil.tcl.tk Thanks for the link. What does Eskill provide that isn't provided by installing ActiveTcl and running fossil --tk? ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] [gdiff] Recommanded GUI differ for Windows?
On Wed, 21 Nov 2012 14:43:21 +0100, Gilles gilles.gana...@free.fr wrote: I prefer to use a GUI differ than the text-based solution. ... and it only occured to me that I misspelled recommended. Wrong language :-) ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] [gdiff] Recommanded GUI differ for Windows?
fwiw I've used kdiff3 (http://kdiff3.sourceforge.net/) on windows with good success. It can do merges as well though I've yet to actually use that functionality To: fossil-users@lists.fossil-scm.org From: gilles.gana...@free.fr Date: Thu, 22 Nov 2012 00:20:37 +0100 Subject: Re: [fossil-users] [gdiff] Recommanded GUI differ for Windows? On Wed, 21 Nov 2012 14:43:21 +0100, Gilles gilles.gana...@free.fr wrote: I prefer to use a GUI differ than the text-based solution. ... and it only occured to me that I misspelled recommended. Wrong language :-) ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
Re: [fossil-users] [gdiff] Recommanded GUI differ for Windows?
ExamDiff Pro. http://www.prestosoft.com/edp_examdiffpro.asp On Wed, Nov 21, 2012 at 7:47 PM, Tomek Kott tkott.li...@outlook.com wrote: fwiw I've used kdiff3 (http://kdiff3.sourceforge.net/) on windows with good success. It can do merges as well though I've yet to actually use that functionality To: fossil-users@lists.fossil-scm.org From: gilles.gana...@free.fr Date: Thu, 22 Nov 2012 00:20:37 +0100 Subject: Re: [fossil-users] [gdiff] Recommanded GUI differ for Windows? On Wed, 21 Nov 2012 14:43:21 +0100, Gilles gilles.gana...@free.fr wrote: I prefer to use a GUI differ than the text-based solution. ... and it only occured to me that I misspelled recommended. Wrong language :-) ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
