Re: Suggestion: Display M-to-N lines replacement as one change instead of two

Hi,

2010/1/14 Dmitry <wipedout_at_yandex.ru>:
> Hey.
>
> In Tortoise SVN whenever I replace M adjacent lines with N adjacent lines (M != N) this is reflected as two changes. For example, I replace 3 lines code fragment with 2 lines code fragment - this will be displayed as "replaced the first two lines with other two lines" and "deleted the third line".
>
> This is not very convenient. First, it generates extra data the user will have to analyze and finally see that it is one change - 3 lines replaced with 2 lines. Second, two "Next diff"s required to proceed to the next real change.
>

In addition, it also makes it more difficult to properly resolve
conflicts, as the effect of 'use their before mine' (or 'mine before
their') results in mixing the changes instead of actually placing one
change before the other.

Is it SVN that determines how the changes are distributed, or does
TSVN play a role in this?

-- 
Regards,
Jean-Marc
--
.       ___
.  @@  // \\      "De Chelonian Mobile"
. (_,\/ \_/ \     TortoiseSVN
.   \ \_/_\_/>    The coolest Interface to (Sub)Version Control
.   /_/   \_\     http://tortoisesvn.net
------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=757&dsMessageId=2437251
To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].