Hi,
With svn r1944 there is a new plugin to create and show a diff between working copy of a file and the version from inside svn. Just have a try and give any feedback ;).
Frank
On Mon, 15 Oct 2007 10:56:09 +0200, Frank Lanitz linux@partysoke.de wrote:
Hi,
With svn r1944 there is a new plugin to create and show a diff between working copy of a file and the version from inside svn. Just have a try and give any feedback ;).
Frank
I love you. ;)
Now this is a cool feature!!!
Maybe you can add a dialog if the file isn't present in svn (svn add <file>) or when the file doesn't reside in a svn checkout (error)?
-H-
Hi Harald,
On Mon, 15 Oct 2007 11:32:25 +0200 Harold Aling h.aling@home.nl wrote:
Now this is a cool feature!!!
Thanks.
Maybe you can add a dialog if the file isn't present in svn (svn add <file>) or when the file doesn't reside in a svn checkout (error)?
It's planed for one of the next versions, but right now I'm not pretty sure, how it will looks like. Stay tuned ;D
Frank
Hi Frank
Frank Lanitz wrote:
Hi,
With svn r1944 there is a new plugin to create and show a diff between working copy of a file and the version from inside svn. Just have a try and give any feedback ;).
Very cool indeed!
A minor question: The plugin only compares the saved file to svn. If there are any unsaved changes, they are ignored.
I think it would be great to first save any unsaved changes before doing the svn diff. Not that saving it myself beforehand is a big issue, but compile/execute in geany does this and so the user expierience is more consistent (which is an issue...).
Bye and thanks Tim
Frank
Geany mailing list Geany@uvena.de http://uvena.de/cgi-bin/mailman/listinfo/geany
Hi tim, hi list,
On Mon, 15 Oct 2007 11:41:19 +0200 Tim Tassonis timtas@cubic.ch wrote:
I think it would be great to first save any unsaved changes before doing the svn diff. Not that saving it myself beforehand is a big issue, but compile/execute in geany does this and so the user expierience is more consistent (which is an issue...).
Should be changed with svn r1947. I thought it's better to don't save because of a possible lost of some changes. But you are 100% true and it were only a few lines of code missing to do it ;D
Frank
Hi Frank
Frank Lanitz wrote:
Hi tim, hi list,
On Mon, 15 Oct 2007 11:41:19 +0200 Tim Tassonis timtas@cubic.ch wrote:
I think it would be great to first save any unsaved changes before doing the svn diff. Not that saving it myself beforehand is a big issue, but compile/execute in geany does this and so the user expierience is more consistent (which is an issue...).
Should be changed with svn r1947. I thought it's better to don't save because of a possible lost of some changes. But you are 100% true and it were only a few lines of code missing to do it ;D
Thanks again, works for me. Sorry to bother you, but I found another tiny little issue: If I have a file in a non-UTF-8 characterset (iso-8859-1 for example), you set the resulting diff to utf-8, breaking my Umlauts(äöü), as "svn diff" in this case will output the data in iso-8859-1.
I haven't looked yet into the plugin interface, but maybe it's possible to check for the charset of the current document and then set the resulting diff to the same one.
But of course you are right if you think I should maybe start switching my projects to UTF-8.....
Bye Tim
Frank
Geany mailing list Geany@uvena.de http://uvena.de/cgi-bin/mailman/listinfo/geany
Hi Tim,
Sorry for my delay.
On Tue, 16 Oct 2007 22:35:28 +0200 Tim Tassonis timtas@cubic.ch wrote:
Sorry to bother you, but I found another tiny little issue: If I have a file in a non-UTF-8 characterset (iso-8859-1 for example), you set the resulting diff to utf-8, breaking my Umlauts(äöü), as "svn diff" in this case will output the data in iso-8859-1.
Right now it's encoded with the encoding, you set for new file inside preferences dialog ( Preferences -> Files -> New files -> Default enconding (new file) )
I'm not sure, what I can do to improve the behavior but I'm promising to try my very best.
But of course you are right if you think I should maybe start switching my projects to UTF-8.....
Yes, I do......
Frank
Hi Tim,
On Tue, 16 Oct 2007 22:35:28 +0200 Tim Tassonis timtas@cubic.ch wrote:
Thanks again, works for me. Sorry to bother you, but I found another tiny little issue: If I have a file in a non-UTF-8 characterset (iso-8859-1 for example), you set the resulting diff to utf-8, breaking my Umlauts(äöü), as "svn diff" in this case will output the data in iso-8859-1.
I've commit a small update to svn (r1968) and hope, that it fix the problem. Please give any feedback.
Frank
P.S. Big thanks to Enrico for a patch to might solve the problem.
Hi Frank
Frank Lanitz wrote:
Hi Tim,
On Tue, 16 Oct 2007 22:35:28 +0200 Tim Tassonis timtas@cubic.ch wrote:
Thanks again, works for me. Sorry to bother you, but I found another tiny little issue: If I have a file in a non-UTF-8 characterset (iso-8859-1 for example), you set the resulting diff to utf-8, breaking my Umlauts(äöü), as "svn diff" in this case will output the data in iso-8859-1.
I've commit a small update to svn (r1968) and hope, that it fix the problem. Please give any feedback.
Just downloaded and tried it and it does fix it perfectly.
Thanks a lot Tim
Frank
P.S. Big thanks to Enrico for a patch to might solve the problem.
Geany mailing list Geany@uvena.de http://uvena.de/cgi-bin/mailman/listinfo/geany
On Tue, 23 Oct 2007 21:49:06 +0200 Tim Tassonis timtas@cubic.ch wrote:
I've commit a small update to svn (r1968) and hope, that it fix the problem. Please give any feedback.
Just downloaded and tried it and it does fix it perfectly.
Nice to here. ;)
Frank
On 15/10/07 09:56:09, Frank Lanitz wrote:
Hi,
With svn r1944 there is a new plugin to create and show a diff between working copy of a file and the version from inside svn. Just have a try and give any feedback ;).
This works great!
I think maybe another menu option for a directory diff would be really useful. It could use the current file's directory, or if a project is open, the project's base directory.
Regards, Nick