[
https://issues.apache.org/jira/browse/SVN-4608?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15044843#comment-15044843
]
Bert Huijben commented on SVN-4608:
-----------------------------------
As noted before: this is not a discussion forum. We don't make design decisions
here... we do that on mailing lists.
Your new files aren't added yet... That is the reason the repository files are
marked deleted. They could match what is in your working copy... or they might
be unrelated. That is why you have a tree conflict.
You have to tell subversion what you want to do.
* You can either add your files (svn add <files>) over what is already there
after marking the conflict as resolved.
* Or you can revert your local changes (which resolves the conflict as resolved
in a single step)
Not marking the files as deleted would make the decision for you... Essentially
we then already reverted your local changes for you, by just marking them as a
modified version of what is in the repository. (You can actually get this
behavior by passing --force)
And if you use 'svn' it would have already invoked the interactive conflict
resolver before you can even see that the files are marked as deleted... So
something is missing in your report. Perhaps you are using a different client?
(And then your question might belong there)
> 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.4#6332)
