[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

Re: What do you Hate about Subversion?

From: Josh Pieper <jjp_at_pobox.com>
Date: 2007-01-19 21:00:27 CET

Byron Brummer wrote:
> Perhaps I was unclear. I want to diff the actual working copy
> file. SVN's --old/--new so far as I can tell only use the
> meta info from the WC to look the URL up and then it does
> a URL to URL diff from there. Unless I missed something it
> can not do a diff between the actual (possibly modified) WC
> and a URL?

You were not unclear, the --old --new syntax allows for all four
possible combinations of WC and URL. For instance, in a checkout of
svn trunk with a version of COMMITERS add a single arbitrary line to
the end to make for a local modification. The following commands will
all return what you expect, I just tested them all with a 1.4.2
client.

svn diff COMMITTERS
Will show just the extra line.

svn diff --old=COMMITTERS@BASE --new=COMMITERS
Will show the same diff as the first command did.

svn diff --old=http://svn.collab.net/repos/svn/branches/1.4.x/COMMITTERS --new=COMMITTERS
Will show all changes since 1.4.x plus your extra line. I believe
this is what you wanted to accomplish.

svn diff --old=COMMITTERS --new=http://svn.collab.net/repos/svn/branches/1.3.x/COMMITTERS
Will show the removal of everything since 1.3.x, plus the removal of
your extra line.

svn diff --old=http://svn.collab.net/repos/svn/branches/1.3.x/COMMITTERS --new=http://svn.collab.net/repos/svn/branches/1.4.x/COMMITTERS
Will show all changes from 1.3.x to 1.4.x.

-Josh

---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@subversion.tigris.org
For additional commands, e-mail: users-help@subversion.tigris.org
Received on Fri Jan 19 21:02:05 2007

This is an archived mail posted to the Subversion Users mailing list.