On Mon, Feb 20, 2017 at 8:50 PM, <jcorvel_at_apache.org> wrote:
> Author: jcorvel
> Date: Mon Feb 20 19:50:38 2017
> New Revision: 1783790
>
> URL: http://svn.apache.org/viewvc?rev=1783790&view=rev
> Log:
> * publish/docs/release-notes/1.10.html: put "keep working copy state" as
> resolution option for local change "deleted directory".
>
> Modified:
> subversion/site/publish/docs/release-notes/1.10.html
>
> Modified: subversion/site/publish/docs/release-notes/1.10.html
> URL: http://svn.apache.org/viewvc/subversion/site/publish/docs/release-notes/1.10.html?rev=1783790&r1=1783789&r2=1783790&view=diff
> ==============================================================================
> --- subversion/site/publish/docs/release-notes/1.10.html (original)
> +++ subversion/site/publish/docs/release-notes/1.10.html Mon Feb 20 19:50:38 2017
> @@ -350,9 +350,10 @@ href="https://wiki.apache.org/subversion
> <td><ul>
> <li>any change inside directory</li>
> </ul></td>
> - <td>update, switch</td>
> + <td>update, switch, merge</td>
> <td><ul>
> - <li>...</li>
> + <li>keep working copy state (deleted directory),<br>
> + discarding incoming changes</li>
> </ul></td>
> </tr>
> </table>
Stefan, I suppose the above is correct (for update, switch and merge),
and corresponds to the (r) (mark as resolved) option, right?
Am I right that the same goes for "delete file" (local change) and
"edit file" (incoming change)? If so I can extend that row from
"delete directory" to "delete item" for the local change.
Is it also possible to revert the local deletion and accept the
incoming change(s) from within the resolver? I think that would be a
nice "alternative action" in this case (but postponing and then
reverting from outside of the resolver seems a bit cumbersome and less
intuitive for the user).
--
Johan
Received on 2017-02-20 20:57:47 CET