Re: [fossil-users] How to gdiff two versions of a file?
On Wed, 2 Nov 2011 12:22:27 -0400, Ron Wilson ronw.m...@gmail.com wrote: Is there a way to check what parameters Fossil uses to call the gdiffer? Create a batch script with the line: echo %1% %2% %3% %4% %5% %6% %7% %8% %9% Thanks for the tip. I'll go ask in the forum why WinMerge doesn't display the files as expected: C:\Projects\Project1fossil finfo Form1.vb History of Form1.vb 2011-11-05 [6a07f19e02] Code complete (user: Joe, artifact: [9735460a2c]) 2011-11-04 [367bcfa41a] Some comment (user: Joe, artifact: [da4cb1ce3b]) C:\Projects\Project1fossil gdiff --from da4cb1ce3b --to 9735460a2c Form1.vb C:\fossil.exe: no such checkin: da4cb1ce3b C:\Projects\Project1fossil gdiff --from 367bcfa41a --to 6a07f19e02 Form1.vb /temp/kE30YW5dHfVyjJq /temp/IEUmm1z9sO9QYJJ ___ 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] How to gdiff two versions of a file?
On Tue, 08 Nov 2011 15:58:21 +0100, Gilles gilles.gana...@free.fr wrote: C:\Projects\Project1fossil gdiff --from 367bcfa41a --to 6a07f19e02 Form1.vb /temp/kE30YW5dHfVyjJq /temp/IEUmm1z9sO9QYJJ Found it: If the repository is located in the C partition, Fossil checks out those temporary files in C:\temp\ but as shown above, the paths don't include the partition later so WinMerge can't locate the files. ___ 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] How to gdiff two versions of a file?
On Tue, 08 Nov 2011 16:36:25 +0100, Gilles gilles.gana...@free.fr wrote: Found it: If the repository is located in the C partition, Fossil checks out those temporary files in C:\temp\ but as shown above, the paths don't include the partition later so WinMerge can't locate the files. s/later/letter/ ___ 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] How to gdiff two versions of a file?
On Wed, 02 Nov 2011 04:23:20 +0100, Gilles gilles.gana...@free.fr wrote: C:\Projectsfossil gdiff --from d4980ff4a7 --to 7c50b63ab5 Project1/Form1.vb = WinMerge opens, but files aren't displayed. Is there a way to check what parameters Fossil uses to call the gdiffer? Does it create two temporary names before calling the gdiffer, eg. with... gdiff-command=C:/Program Files/WinMerge/WinMergeU.exe ... it would simply do something like this: C:/Program Files/WinMerge/WinMergeU.exe file1 file2 ___ 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] How to gdiff two versions of a file?
On Wed, Nov 2, 2011 at 6:16 AM, Gilles gilles.gana...@free.fr wrote: On Wed, 02 Nov 2011 04:23:20 +0100, Gilles gilles.gana...@free.fr wrote: C:\Projectsfossil gdiff --from d4980ff4a7 --to 7c50b63ab5 Project1/Form1.vb = WinMerge opens, but files aren't displayed. Is there a way to check what parameters Fossil uses to call the gdiffer? Create a batch script with the line: echo %1% %2% %3% %4% %5% %6% %7% %8% %9% ___ 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] How to gdiff two versions of a file?
On Mon, 31 Oct 2011 12:48:56 +0100, Gilles gilles.gana...@free.fr wrote: WinMerge works fine when diffing a file in the working directory and a revision in the repo: Does someone use WinMerge successfuly to diff two revisions, ie. after the changes have been commited to the repo? Any idea how to get WinMerge or any other GUI differ to display the changes between two revisions? C:\Projectsfossil finfo Project1/Form1.vb History of Project1/Form1.vb 2011-10-24 [d4980ff4a7] Another comment (user: Me, artifact: [68cc25c775]) 2011-10-12 [7c50b63ab5] New file (user: Me, artifact: [29dfdcbd50]) C:\Projectsfossil diff --from d4980ff4a7 --to 7c50b63ab5 Project1/Form1.vb = OK C:\Projectsfossil gdiff --from d4980ff4a7 --to 7c50b63ab5 Project1/Form1.vb = WinMerge opens, but files aren't displayed. 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] How to gdiff two versions of a file?
On Thu, 27 Oct 2011 10:15:30 -0400, Martin Gagnon eme...@gmail.com wrote: To show only diff of Project1/Form1.vb, you should specify the filename: fossil gdiff --from 7861174642 --to 6f24ad8afa Project1/Form1.vb Indeed, we must type the name of the file; Using the artifact ID's isn't enough. Have you try with diff instead of gdiff, may be there's a problem in the way your gdiff-command setting is set. Yes, it looks like it's an issue with WinMerge. It works fine with diff. WinMerge works fine when diffing a file in the working directory and a revision in the repo: Does someone use WinMerge successfuly to diff two revisions, ie. after the changes have been commited to the repo? 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] How to gdiff two versions of a file?
On Thu, Oct 27, 2011 at 03:52:04PM +0200, Gilles wrote: Hello After committing the changes I made to a file, I'd like to run the gdiff application to show the changes between the last revision and the before-last revision. I tried the following, but it doesn't work: C:\MyProjectsfossil finfo Project1/Form1.vb History of Project1/Form1.vb 2011-10-27 [7861174642] Another comment (user: Me, artifact: [a84d8e720a]) 2011-10-26 [6f24ad8afa] Added original files (user: Me, artifact: [0b8a3d89b2]) C:\MyProjectsfossil gdiff --from a84d8e720a --to 0b8a3d89b2 C:\fossil.exe: no such checkin: a84d8e720a C:\MyProjectsfossil gdiff --from 7861174642 --to 6f24ad8afa Index: Project1/Form1.vb (Differ doesn't show any file) What is the right way to do this? Thank you. The second one is closer. In the way it is witten, it should show all diff of all files between those 2 version. I don't know why it doesn't work for you. To show only diff of Project1/Form1.vb, you should specify the filename: fossil gdiff --from 7861174642 --to 6f24ad8afa Project1/Form1.vb Have you try with diff instead of gdiff, may be there's a problem in the way your gdiff-command setting is set. Is you file a binary file ? If it's the case, fossil will return an error saying: cannot compute difference between binary files -- Martin G. ___ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
