On 11/2/2015 9:06 PM, Stefan Küng wrote:
> On 23.10.2015 12:24, Stefan Hett wrote:
>> Hi,
>>
>> Steps to reproduce:
>> 1. Merge some revision into a trunk/branch with a text-conflict.
>> 2. In the pop-up select: "Edit Conflict".
>> 3. When the merge tool opens, just close it
>> 4. Click on the "Resolved" button
>>
>> Actual result:
>> The resulting file in the working copy is empty
>>
>> Expected result:
>> Either it should not be possible to click the Resolved button if there
>> are still conflict markers in the file at all or if you can click it, at
>> least do not modify the file (and remove all its contest).
> Well, how would TSVN know whether you saved changes from the external
> merge tool?
Hm... to answer that I'd have to check out how TortoiseSVN does its job.
So if you are suggesting it's not easy, I take it you don't have any way
atm to detect whether the TortoiseSVN merge tool was just closed without
solving the conflict or whether it saved the changes and should consider
the current state as final.
I was under the impression that it saves the result in the files, so it
could detect whether the SVN merge markers were removed or not or at
least consider the incomplete merged state (aka: the file with the SVN
merge conflict markers) as the file to be committed.
Obviously testing this here points out that this is not how things are
working atm (i.e. after step 3 the 4 files all look the same to me be it
with or without having resolved the conflict in the TortoiseSVN merge tool).
>
>> Alternatively it could also be acceptable to keep the local working copy
>> file.
>>
>> Tested with 1.9.2, but we also get reports from users in our company of
>> the same problem (files are empty after resolving conflicts) using 1.8.12.
> Improved the situation in r26952.
> But really: if you lie to TSVN by telling it that you resolved the
> conflict but actually didn't, you can't expect it to work properly.
I just tested the nightly and the current behavior is perfect IMO. It
certainly prevents the occasional errors some of the users did here
resulting in empty files.
So thanks alot for that change.
--
Regards,
Stefan Hett
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=3145328
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2015-11-04 15:02:51 CET