Asserion failure: appying update tree conflict to a moved file which has local modifications

Hi,

When updating a working copy and getting a tree conflict because of a locally moved file that has local modifications, exception is thrown (when auto-applying diff to the moved file or resolving the conflict manually by applying the update to the moved destination):

---------------------------
Subversion Exception!
---------------------------
Subversion encountered a serious problem.
Please take the time to report this on the Subversion mailing list
with as much information as possible about what
you were trying to do.
But please first search the mailing list archives for the error message
to avoid reporting the same problem repeatedly.
You can find the mailing list archives at
http://subversion.apache.org/mailing-lists.html

Subversion reported the following
(you can copy the content of this dialog
to the clipboard using Ctrl-C):

In file
 'D:\Development\SVN\Releases\TortoiseSVN-1.8.3\ext\subversion\subversion\libsvn_wc\wc_db_update_move.c'
 line 1039: assertion failed (move_dst_revision == expected_move_dst_revision
 || status == svn_wc__db_status_not_present)
---------------------------
OK
---------------------------

Aleksej

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3067905

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2013-11-05 16:47:08 CET