Re: Extending new update --force switch to handle local additions -- also new related FAQ

On Fri, 11 Aug 2006 01:24:10 +0530, Mark Phippard <markp@softlanding.com>
wrote:

[snip]

> The attached FAQ talks about the situation and how to get out of it using
> svn revert followed by a delete or move. It does not talk about the
> upcoming --force option. I am not crazy about the wording of this FAQ as
> it seems too specific, so I'd appreciate a better way to write this.

Two suggestions:

1.
+<p>The reason that you recieved this error is that you still have your
local copy of
+the file in your working copy. The steps to correct this problem are:</p>

The following would be more specific:
+<p>The reason that you recieved this error is that you still have your
local copy of
+the file in your working copy, with a scheduled add. The steps to
correct this problem are:</p>

Pl. note the "with the scheduled add".

That said, we could explain the first step thus:
+ <li>Run the <tt>svn revert</tt> command to remove the scheduled add
within
+ Subversion to remove the scheduled add.</li>

The above two changes would give more clarity to the user, as to *why* he
is doing the revert in the first place.

2. There could be a tiny weeny bit more clarity when saying "Run the svn
revert command". Maybe we could say "Run the svn revert command on the
added files(s)"?

Regards,
Madan.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@subversion.tigris.org
For additional commands, e-mail: dev-help@subversion.tigris.org
Received on Wed Aug 23 08:41:41 2006