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

Re: [PATCH] clarify error message in svn add

From: Madan U Sreenivasan <madan_at_collab.net>
Date: 2006-07-28 03:06:20 CEST

On Wed, 26 Jul 2006 01:55:49 +0530, David Glasser <glasser@mit.edu> wrote:

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

[snip]

Please specify the function name in the log.

Also, the new message extends the line to beyond 80 characters. I think
this should be fixed.

Regards,
Madan U S
www.symonds.net/~madan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Thu Jul 27 21:37:33 2006

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