[
https://issues.apache.org/jira/browse/SVN-4608?page=com.atlassian.jira.plugin.system.issuetabpanels:comment-tabpanel&focusedCommentId=15044837#comment-15044837
]
Yuri edited comment on SVN-4608 at 12/7/15 12:19 PM:
-----------------------------------------------------
In general in such situation one can lose one's work. But the way that I
suggested prevents this. Ex. if no files are different between the new and
pre-existing, keeping them can't cause the data loss.
Making new files 'deleted' certainly damages.
was (Author: yurivict):
In general in such situation one can lose one's work. But the way how I
suggested one can't lose work. If no files are different between new and
pre-existing, keeping them can't cause the data loss.
> 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)
