[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

"Link" corresponding line versions on Left&Right

From: Arcadius <info_at_fedushin.ru>
Date: Tue, 27 Apr 2010 01:03:59 +0400

Sometimes when comparing 2 revisions of a versioned file, TortoiseMerge
displays left & right versions of the same line on different positions
Now, user can't do anything with it (if really he can - forgive me for bad

The suggestion is to let user mark versions of the same line as
corresponding. Remember his choice for the future comparisons.
Store a set of line matchings for each versioned file. During comparisons
use them in following way:
1. "Split" both file revisions by pairs of linked lines,
2. Compare each pair of corresponding parts individually,
3. Compare each pair of linked lines individually.

Maybe, to simplify algorithms, support line-linking only between adjacent
file revisions.


To unsubscribe from this discussion, e-mail: [dev-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2010-04-26 23:14:43 CEST

This is an archived mail posted to the TortoiseSVN Dev mailing list.