You are viewing a plain text version of this content. The canonical link for it is here.
Posted to users@subversion.apache.org by Richard Bos <ml...@radoeka.nl> on 2007/05/08 18:24:45 UTC
svnodiff - a differ for ODF based documents stored in subversion
Hi,
as I have quite some ODF documents stored in an subversion repository, I have
been looking at ways how to 'svn diff ODF-files'. As I have not been able to
found such a utility I created one myself, and called it svnodiff. AFAIC
determine, it works similar to 'svn diff', with e.g. support for "-r
HEAD:PREV", not much more options are further available, there is e.g.
no "-x". In case you want to have a look at the script or want to try it,
the script can be obtained from: http://linux01.gwdg.de/apt4rpm/svnodiff
I'm interested in whether the used method to obtain the files (archives) for
diffing is okay. Perhaps that there are easier ways to do it. Would it be
possible to do it on the server instead of on the client?
Two things, at the moment it is required that the xml files are stored with
idented tags (that's about each opening tag should be on a seperate line).
The default action is to diff the content.xml files only, and than only the
body part. To obtain a full diff the -a (--all-files) option can be used.
Would it be possible to include such a differ in e.g. TortoiseSVN.
Hopefully this is usefull for someone, not sure whether this is the right list
for this announcement. Perhaps the OO.org would have been better?
--
Richard Bos
Without a home the journey is endless
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svnodiff - a differ for ODF based documents stored in subversion
Posted by Jared Silva <ja...@gmail.com>.
Richard Bos wrote:
> It's via Tortoise -> show log -> select a revision -> select diff or compare
> (don't remember which one I choose).
This looks like a bug. You should bring the discussion to the
TortoiseSVN mailing list.
Keep in mind the version from the link is newer than the version
supplied by TortoiseSVN 1.4.3.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svnodiff - a differ for ODF based documents stored in subversion
Posted by Richard Bos <ml...@radoeka.nl>.
Op Thursday 10 May 2007 21:02:08 schreef Jared Silva:
> Can you provide more detail as to how you are invoking the script and
> how it is reacting? Are you doing this through the command line or
> through TortoiseSVN? If you are doing this through TortoiseSVN, you
> may want to use their mailing list.
It's via Tortoise -> show log -> select a revision -> select diff or compare
(don't remember which one I choose).
--
Richard Bos
We are borrowing the world of our children,
It is not inherited from our parents.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svnodiff - a differ for ODF based documents stored in subversion
Posted by Jared Silva <ja...@gmail.com>.
Richard Bos wrote:
> Tried it today, and it worked initially. When I tried to repeat this, it did
> not work. What are the requirements to have it work? Should the mimetype be
> set to ...opendocument...text?
I did not write the script, so I do not know what the requirements
are. You should not need a mime-type set. You could provide any two
files to the script if you wanted.
Can you provide more detail as to how you are invoking the script and
how it is reacting? Are you doing this through the command line or
through TortoiseSVN? If you are doing this through TortoiseSVN, you
may want to use their mailing list.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svnodiff - a differ for ODF based documents stored in subversion
Posted by Richard Bos <ml...@radoeka.nl>.
Op Tuesday 08 May 2007 20:59:38 schreef Jared Silva:
> Richard Bos wrote:
> > Would it be possible to include such a differ in e.g. TortoiseSVN.
>
> TortoiseSVN already includes such a differ.
>
> http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/contrib/other/diff-scri
>pts/
Tried it today, and it worked initially. When I tried to repeat this, it did
not work. What are the requirements to have it work? Should the mimetype be
set to ...opendocument...text?
--
Richard Bos
We are borrowing the world of our children,
It is not inherited from our parents.
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Re: svnodiff - a differ for ODF based documents stored in subversion
Posted by Jared Silva <ja...@gmail.com>.
Richard Bos wrote:
> Would it be possible to include such a differ in e.g. TortoiseSVN.
TortoiseSVN already includes such a differ.
http://tortoisesvn.tigris.org/svn/tortoisesvn/trunk/contrib/other/diff-scripts/
username : guest
password : ""
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org