comparing a url and a working copy

Dear People,

I am trying to compare differences between
file:///home/faheem/svn/mg-ro/brent and the working copy
/home/faheem/co/mg-ro/mono, since I just tried merging the branch
brent back into its parent (ancestor?) directory mono, and I wanted to
check if there were any differences between the version of brent in
the repository and the working copy mono.

Currently I have

faheem ~/co/mg-ro>svn st
 M mono
M mono/Makefile
A + mono/brent.cc
A + mono/brent.hh
M mono/debug.R
M mono/debug.cc
M mono/dist.cc
A + mono/getinv.c
D mono/int.cc
A + mono/inv.cc
M mono/mg.R

I tried

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)

Perhaps I'm using the syntax wrongly. I thought this should compare
the HEAD version of the url and the working copy.

svn help diff

says

  N defaults to "BASE" or, if OLD-TGT is an URL, to "HEAD". M
  defaults to the current working version or, if NEW-TGT is an URL, to
  "HEAD".

By the way, is the Subversion book documentation current as regards
the new svn diff syntax? The version at svnbook.redbean.com does not
seem to be.

                                                      Faheem.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jun 26 07:33:58 2003