On 2011-12-15 9:19, Hans-Emil Skogh wrote:
>>> Comment #1 on issue 81 by bruce.fr..._at_gmail.com: Manually aligning
>>> lines in TortoiseMerge
>>> http://code.google.com/p/tortoisesvn/issues/detail?id=81
>>>
>>> I am editing a number of files which, due to changes in standards,
>>> don't actually have a lot of changes, but are showing up with a lot.
>>> The ability to align would greatly overcome the problem.
>> There already was some diskusion about this and at that of coming
>> 1.7.x was sheduled to be after 1.7.x. It seems that now time become.
>> (We also talk about rewriting from 3 view list to one 3view list).
>> However I would like what should be operation to perform it? For this
>> you need select line in right and left ... how? Some kind of add anchor?
> The proprietary program Araxis Merge has an excellent implementation of this feature.
>
> The feature is described in their manual:
> http://www.araxis.com/merge/topic_comparison_synchronization_links.html
>
> Note that modification of location of a synchronization link is performed by dragging the synchronization link arrow.
Looks good, but for longer distance draging is not most comfortable at
least for me.
I suggest:
* right click on left/right panel select "add anchor(sync point)" -
for hovered line
* right click again on same panel give option "move new anchor"
* right click on right/left panel and "use anchor(sync point)"
* right click on line with anchor would have option "delete anchor"
after set up sync you can use drag, but I afraid that may lead to lots
of edge cases - anchors on empty lines, anchors out of orders ...
Note we use other method to show changes instead of arrow we line up
matched lines. This require that anchors in left and right view need to
have same order.
--
Oto BREZINA
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2893518
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-12-15 11:19:36 CET