[
https://issues.apache.org/jira/browse/SVN-4608?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15861268#comment-15861268
]
Stefan Sperling commented on SVN-4608:
--------------------------------------
This problem should be fixed by the new conflict resolver to be released in
1.10:
https://subversion.apache.org/docs/release-notes/1.10.html#conflict-resolver
The new resolver offers an option to merge directories added on both sides
automatically, for updates and for merges between branches.
I am closing this issue. Once 1.10 is released, please let us know if you still
see a problem.
> Files are labeled as 'deleted' when the version brought by an update collides
> with the pre-existing file
> --------------------------------------------------------------------------------------------------------
>
> Key: SVN-4608
> URL: https://issues.apache.org/jira/browse/SVN-4608
> Project: Subversion
> Issue Type: Bug
> Reporter: Yuri
>
> Here is the situation:
> I create the new sub-directory within the repository where I don't have
> commit rights without 'svn add'. Later, when this directory is committed by
> somebody else and repository is updated by me, the files that are coming with
> update are immediately labeled as 'deleted' when they collide with their
> copies that are pre-existent on disk.
> This behavior doesn't make much sense. If the file brought by an update is
> already on disk, it should be silently overwritten in case the contents are
> the same, or the user should be asked the question what to do: accept the new
> version, keep the pre-existing version, or launch the merge tool.
--
This message was sent by Atlassian JIRA
(v6.3.15#6346)
