On Thu, 26 Jun 2003, Philip Martin wrote:
> Ben Collins-Sussman <sussman@collab.net> writes:
>
> >> faheem ~/co/mg-ro>svn diff --old file:///home/faheem/svn/brent --new
> >> /home/faheem/co/mg-ro/mono
> >>
> >> but get
> >>
> >> svn: Working copy not locked
> >> svn: directory not locked (/home/faheem/co/mg-ro/brent)
> >
> > Yes, I believe that after weeks of debate, Philip actually implemented
> > this new 'svn diff' syntax. Unfortunately, there's no actual *code*
> > in the back-end to support your use-case yet! See issue #1142.
>
> You may be able to find a command that does work. Take a look at the
> diff_branches test in diff_tests.py, there is a test for
>
> svn diff --old URL --new PATH REL
>
> which works, and a test for
>
> svn diff --old URL --new PATH
>
> which is commented out because it doesn't work.
I found the tests you are referring to (below). However, I'm still fuzzy
about what the syntax means. What does REL above correspond to? I see this
corresponds to rel_path in the tests, but that doesn't help me much. :-)
Faheem.
**********************************************************************
rel_path = os.path.join('B', 'E', 'alpha')
[...]
# Compare working file on one branch against repository file on
# another branch
A_path = os.path.join(sbox.wc_dir, 'A')
diff_output, err_output = svntest.main.run_svn(None, 'diff',
'--old', A2_url,
'--new', A_path,
rel_path)
if err_output: raise svntest.Failure
verify_expected_output(diff_output, "-bar")
verify_expected_output(diff_output, "+foo")
verify_expected_output(diff_output, "+zig")
# Same again but using whole branch, hmm this doesn't work
#diff_output, err_output = svntest.main.run_svn(None, 'diff',
# '--old', A2_url,
# '--new', A_path)
#verify_expected_output(diff_output, "-bar")
#verify_expected_output(diff_output, "+foo")
#verify_expected_output(diff_output, "+zig")
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jun 26 22:25:48 2003