Re: TortoiseMerge: Use left file except marked blocks....

On 12.03.2014 15:28, ch3cooli wrote:
>> The mark/unmark are ok - maybe rename those to 'mark for use' or 'mark to include'?
> "Mark block" may be also used for other purposes in the future?

Right, so leave the text then.

>> As long as there are marked blocks, the view is also marked as modified to indicate that it needs saving
> OK. This needs to be done.
>
>> When saving, a task dialog is shown like this:
>> marked blocks
>> You have marked changed blocks. How should those blocks be saved?
>> Save and include
>> Your changes are saved and the marked blocks are included
>> Save and exclude
>> Your changes are saved and the original content is used
>> Save and ignore marked blocks
>> Only your manual edits are saved, marked blocks are left as they are
>> Cancel
>> Your changes are not saved
> Save and include: OK. This needs to be done.
> Save and exclude, Save and ignore marked blocks: Could you explain more clearly?

That would be the opposite of "Save and include". Instead of using the
left file except the marked blocks, use the left file except all
unmarked blocks.

> Cancel: No problem
>
>> Assume you mark a changed block, then edit the content of that changed block. How to handle this conflicting situation?
> The marked flag won't lose. Edited state is another variable.

It's not the edited state or marked flag. It's when you "use left file
except marked blocks" that edit is overwritten.

>> The method CBaseView::UseViewBlock() now copies the left file and leaves all marked blocks as is. I suggest to negate that: use the original text but copy the left lines for unmarked blocks. That way, if the user has edited some unmodified lines these would be kept as well.
> Simply extend the code near line 5766. I don't understand why to negate that.

Edit something in the right view, some line that isn't marked as modified.
If you now use the "use left file except..." those changes would be
overwritten. That's why I think only copying the unmarked blocks would
be better.

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest interface to (Sub)version control
    /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=3074458
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].