You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Avner Moshkovitz <av...@lighthauslogic.com> on 2008/09/30 17:40:50 UTC
How to show the "svn diff" output graphically in context of a
directory tree
Hi,
Using the "svn diff" command, I generate a log file that shows the local changes between my local files and the repository.
I want to view the local changes in context of the files, similar to graphical Diff programs (such as Meld or WinDiff (see attached figure) ). In other words, I want to super impose the diff file on the set of files, such that I can see the tree structure of the files, navigate through the files and graphically view the changes in the files.
I have tried using kdesvn. kdesvn shows the directory structure and highlights the different files. It has an option to "Diff local changes" but this show only the local differences without the context of the entire file.
[cid:156550717@30092008-046D]
Thanks,
Avner
________________________________
This e-mail may contain information that is privileged, confidential or otherwise exempt from disclosure under applicable laws. Unauthorized use, reproduction or dissemination of the e-mail is strictly prohibited. If you have received this e-mail in error, please contact the sender immediately. [11EABB509DF]
RE: How to show the "svn diff" output graphically in context of a
directory tree
Posted by Avner Moshkovitz <av...@lighthauslogic.com>.
Hi,
I have installed the package pysvn.i386 from the Fedora Core 8 repository (and also pysvn-debuginfo.i386) but I can not execute it (I can't find an executable in the name pysvn).
Applying:
find . -name "*pysvn*"
Yields:
./usr/lib/python2.5/site-packages/pysvn
./usr/lib/python2.5/site-packages/pysvn/_pysvn.so
./usr/lib/debug/usr/lib/python2.5/site-packages/pysvn
./usr/lib/debug/usr/lib/python2.5/site-packages/pysvn/_pysvn.so.debug
./usr/src/debug/pysvn-1.5.3
./usr/src/debug/pysvn-1.5.3/Source/pysvn_svnenv.hpp
./usr/src/debug/pysvn-1.5.3/Source/pysvn_docs.cpp
./usr/src/debug/pysvn-1.5.3/Source/pysvn_revision.cpp
./usr/src/debug/pysvn-1.5.3/Source/pysvn_path.cpp
./usr/src/debug/pysvn-1.5.3/Source/pysvn_enum_string.cpp
./usr/src/debug/pysvn-1.5.3/Source/pysvn.cpp
./usr/src/debug/pysvn-1.5.3/Source/pysvn_converters.cpp
./usr/src/debug/pysvn-1.5.3/Source/pysvn_svnenv.cpp
./usr/src/debug/pysvn-1.5.3/Source/pysvn_transaction.cpp
./usr/src/debug/pysvn-1.5.3/Source/pysvn_docs.hpp
./usr/src/debug/pysvn-1.5.3/Source/pysvn_callbacks.cpp
./usr/src/debug/pysvn-1.5.3/Source/pysvn_client.cpp
./usr/src/debug/pysvn-1.5.3/Source/pysvn.hpp
./usr/src/debug/pysvn-1.5.3/Source/pysvn_arg_processing.cpp
./usr/src/debug/pysvn-1.5.3/Source/pysvn_version.hpp
./usr/share/doc/pysvn-1.5.3
./usr/share/doc/pysvn-1.5.3/pysvn_prog_ref.html
./usr/share/doc/pysvn-1.5.3/pysvn_prog_ref.js
./usr/share/doc/pysvn-1.5.3/pysvn_prog_guide.html
./usr/share/doc/pysvn-1.5.3/Examples/Client/pysvn_print_doc.py
./usr/share/doc/pysvn-1.5.3/pysvn.html
Can you instruct me on how to install pysvn?
Thanks,
Avner
|-----Original Message-----
|From: Carsten Koch [mailto:Carsten.Koch@icem.com]
|Sent: Tuesday, September 30, 2008 11:27 AM
|To: Avner Moshkovitz
|Cc: 'users@subversion.tigris.org'
|Subject: Re: How to show the "svn diff" output graphically
|in context of a directory tree
|
|Avner Moshkovitz wrote:
|...
|> I am not familiar with Python. My development language is C++.
|> Would this matter, or I can use the pysvn as a generic
|svn tool for my C++ development as well?
|
|It does not matter.
|You can use the pysvn workbench program without knowing any Python.
|The pysvn workbench program is a Python program that uses
|the pysvn and wxPython toolkits to interface with svn and
|to display the GUI. You do not have to do any programming
|to use workbench.
|
|> I guess you have the option to tie a graphical diff
|program (e.g. kdiff3) to pysvn.
|
|Yes. pysvn workbench has a preferences menu that allows you
|to specify which program to use for graphical diff.
|You can also use vrious built-in diff viewers.
|
|
|> Do you know if a similar approach is possible with kdesvn? (i.e.
|> define a graphical diff program to kdesvn)
|
|I am using pysvn workbench. I have no experience with kdesvn.
|
|Carsten.
|
|
This e-mail may contain information that is privileged, confidential or otherwise exempt from disclosure under applicable laws. Unauthorized use, reproduction or dissemination of the e-mail is strictly prohibited. If you have received this e-mail in error, please contact the sender immediately. [11EABB509DF]
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: How to show the "svn diff" output graphically in context of a
directory tree
Posted by Carsten Koch <Ca...@icem.com>.
Avner Moshkovitz wrote:
...
> I am not familiar with Python. My development language is C++.
> Would this matter, or I can use the pysvn as a generic svn tool for my C++ development as well?
It does not matter.
You can use the pysvn workbench program without knowing any Python.
The pysvn workbench program is a Python program that uses the
pysvn and wxPython toolkits to interface with svn and to display
the GUI. You do not have to do any programming to use workbench.
> I guess you have the option to tie a graphical diff program (e.g. kdiff3) to pysvn.
Yes. pysvn workbench has a preferences menu that allows
you to specify which program to use for graphical diff.
You can also use vrious built-in diff viewers.
> Do you know if a similar approach is possible with kdesvn? (i.e. define a graphical diff program to kdesvn)
I am using pysvn workbench. I have no experience with kdesvn.
Carsten.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
RE: How to show the "svn diff" output graphically in context of a
directory tree
Posted by Avner Moshkovitz <av...@lighthauslogic.com>.
Hi Carsten,
I am not familiar with Python. My development language is C++.
Would this matter, or I can use the pysvn as a generic svn tool for my C++ development as well?
I guess you have the option to tie a graphical diff program (e.g. kdiff3) to pysvn. Do you know if a similar approach is possible with kdesvn? (i.e. define a graphical diff program to kdesvn)
Thanks,
Avner
|-----Original Message-----
|From: Carsten Koch [mailto:Carsten.Koch@icem.com]
|Sent: Tuesday, September 30, 2008 11:11 AM
|To: Avner Moshkovitz
|Cc: 'users@subversion.tigris.org'
|Subject: Re: How to show the "svn diff" output graphically
|in context of a directory tree
|
|Avner Moshkovitz wrote:
|...
|> I want to view the local changes in context of the files,
|similar to
|> graphical Diff programs (such as Meld or WinDiff (see
|attached figure)
|> ). In other words, I want to super impose the diff file
|on the set of
|> files, such that I can see the tree structure of the
|files, navigate
|> through the files and graphically view the changes in the files.
|
|I am using pysvn workbench, see
| http://pysvn.tigris.org/
|with kdiff3, see
| http://kdiff3.sourceforge.net/
|configured as the graphical diff program.
|
|Carsten.
|
This e-mail may contain information that is privileged, confidential or otherwise exempt from disclosure under applicable laws. Unauthorized use, reproduction or dissemination of the e-mail is strictly prohibited. If you have received this e-mail in error, please contact the sender immediately. [11EABB509DF]
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: How to show the "svn diff" output graphically in context of a
directory tree
Posted by Carsten Koch <Ca...@icem.com>.
Avner Moshkovitz wrote:
...
> I want to view the local changes in context of the files, similar to
> graphical Diff programs (such as Meld or WinDiff (see attached figure)
> ). In other words, I want to super impose the diff file on the set of
> files, such that I can see the tree structure of the files, navigate
> through the files and graphically view the changes in the files.
I am using pysvn workbench, see
http://pysvn.tigris.org/
with kdiff3, see
http://kdiff3.sourceforge.net/
configured as the graphical diff program.
Carsten.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: How to show the "svn diff" output graphically in context of a directory tree
Posted by Bogdan Cristea <cr...@gmail.com>.
On Wednesday 01 October 2008 11:31:24 Hendrik Maryns wrote:
> Avner Moshkovitz schreef:
> > Hi,
> >
> >
> >
> > Using the “svn diff” command, I generate a log file that shows the local
> > changes between my local files and the repository.
> >
> > I want to view the local changes in context of the files, similar to
> > graphical Diff programs (such as Meld or WinDiff (see attached figure)
> > ). In other words, I want to super impose the diff file on the set of
> > files, such that I can see the tree structure of the files, navigate
> > through the files and graphically view the changes in the files.
> >
> > I have tried using kdesvn. kdesvn shows the directory structure and
> > highlights the different files. It has an option to “Diff local changes”
> > but this show only the local differences without the context of the
> > entire file.
>
> Have a look at Eclipse + Subclipse.
>
> H.
Other solution is to use viewvc, which among other things has a graphical diff
program similar with kdiff
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: How to show the "svn diff" output graphically in context of a
directory tree
Posted by Hendrik Maryns <qw...@sneakemail.com>.
Avner Moshkovitz schreef:
>
>
> Hi,
>
>
>
> Using the “svn diff” command, I generate a log file that shows the local
> changes between my local files and the repository.
>
> I want to view the local changes in context of the files, similar to
> graphical Diff programs (such as Meld or WinDiff (see attached figure)
> ). In other words, I want to super impose the diff file on the set of
> files, such that I can see the tree structure of the files, navigate
> through the files and graphically view the changes in the files.
>
> I have tried using kdesvn. kdesvn shows the directory structure and
> highlights the different files. It has an option to “Diff local changes”
> but this show only the local differences without the context of the
> entire file.
Have a look at Eclipse + Subclipse.
H.
--
Hendrik Maryns
http://tcl.sfs.uni-tuebingen.de/~hendrik/
==================
Ask smart questions, get good answers:
http://www.catb.org/~esr/faqs/smart-questions.html