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

Re: svn diff branch woprking copy against mainline?

From: Kevin Puetz <puetzk_at_puetzk.org>
Date: 2005-11-04 01:53:43 CET

Kevin Puetz wrote:

> so, for the most common cases, we'd have
> which would do
> # svn info
> URL: svn://root/trunk/subdir
> Repository-Root: svn://root
>
> # svn diff -p1:/branches/foo bar.c baz.c (trunk to branch)
> which would mean:
> # svn diff --old svn://root/trunk/subdir --new
> svn://root/branches/foo/subdir bar.c baz.c
> -----
> # svn info
> URL: svn://root/branches/foo/subdir
> Repository-Root: svn://root
>
> #svn diff -p2:/trunk bar.c baz.c (branch to trunk)
> which would mean:
> #svn diff --old svn://root/branches/foo/subdir --new
> #svn://root/trunk/subdir
> bar.c baz.c
>
> This feels like it translates pretty straightforwardly onto the existing
> --old and --new primitives, doesn't break the SVN "it's a filesystem"
> paradigm, and it's pretty agreably terse for common operations and
> repository layouts.
>
> It probably needs some way to reverse the interpretation of old and new,
> since reversing the order and doing -p/path:2 looks weird and has a
> quoting problem to find the :. Maybe +pN:/path? Or just svn diff
> --reverse.
>
> It's mildly annoying to have to think about the depth of the current WC,
> but I don't really think it's too bad - it wouldn't work well for
> scripting, but --old and --new work find for that - scripts don't mind the
> typing.
>
> Ok, here goes nuthin'...

Hmm, and here I go poking the first hole in the idea myself. Because both of
the above probably mean --old=. (WC as the comparison), not --old=$URL@HEAD
(or $URL@BASE). Perhaps -pN@peg:/path@peg, where giving a peg on the -pN
means that the local source is a repository location and not the WC. Or
maybe you can't use this syntax except for WC to URL. Hmm...

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Fri Nov 4 01:58:32 2005

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