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

>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?

>As for the context menu entry "use left file except marked blocks", how about renaming that to "leave only marked blocks" or "revert unmarked blocks"?
I am for "use left file except marked blocks".

>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?
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.

>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.

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

To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2014-03-12 16:41:37 CET