[PATCH] clarify error message in svn add

If you do something like:

  svn mkdir dir-should-be-file
  svn ci -m "make dir"
  svn rm dir-should-be-file
  svn ci -m "oops, should be file"
  touch dir-should-be-file
  svn add dir-should-be-file

you get the error:
  svn: Can't replace 'dir-should-be-file' with a node of a differing
type; commit the deletion, update the parent, and then add
'dir-should-be-file'

When I came across this, I was pretty confused at first, since the
first thing it tells me to do is commit the deletion, and I already
did that. Attached is a patch which changes the message slightly to
hopefully make it more clear that you might have done the first step
but not the second.

I can imagine that there's an even better way of wording this, and as
eh mentioned on IRC, it would better to just add the functionality;
this is a small improvement anyway.

[[[
* subversion/libsvn_wc/adm_ops.c
  Clarify node type change error message to not imply that the next step
  must be to "commit the deletion", which may have already occured.
]]]

--dave

-- 
David Glasser | glasser_at_mit.edu | http://www.davidglasser.net/

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org