Issue: File marked as resolved but merge resolution not saved

Hi

What I do:
 * Resolving conlict on a read-only file after merge.
 * After removing all conflicts I click 'Mark as resolved'.
 * A dialog appears to select a file to save changes since the original one is read-only.
 * Cancel saving.
 * Quit conflict resolution editor (exit without saving).

What happens:
 * The file is marked as resolved.
 * The file contains conflict marks. It is easy to overlook that the file is broken and to commit it.

What I expect:
 * When saving is canceled the file should not be marked as resolved.

Other info:
Most cases when I encounter the issue are those when files have svn:needs-lock=* property.
Automatic merge manages well such read-only files.
Why conflict resolution editor does not?

Version: 1.9.2

Best regards
WD

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

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-12-11 16:14:22 CET