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

Re: comparing a url and a working copy

From: Faheem Mitha <faheem_at_email.unc.edu>
Date: 2003-06-26 22:24:48 CEST

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. :-)



  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,
  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

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.