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

RE: Re: Feature request: Align manually feature for both diff and merge

From: Peter Yamamoto <yamamotop_at_page44.com>
Date: 2006-10-12 21:19:07 CEST

If you have not had the pleasure of a manual align, I highly suggest you download beyond compare and try it.

A typical use case for coders is when somebody moves code (and possibly modifies it as well).

When doing the diff, most diffs just show this as a new block. (when two users do similar stuff, then you really need to be able to align the two blocks to diff them).

Manual align simply means to start (re)diffing the two files from this point on (where you aligned them).

So if somebody moved the block of code at line 35000, to line 560, for example, I could manually align 3500 with 560 and be able to easily see if the block of code was modified or not (as well as have all left/right diff/editing features available).

Without this feature, it is very difficult/time consuming/error prone to evaluate such diffs.

That's one very typical, very useful, use case example.

Another one is checking/verifying/diffing copy and paste blocks. Since you can align the original with the new paste, you can more easily verify that anything that should have been changed in the pasted version (for example) was changed from the original.

Another one is when using a code section as a template in another place. Even though the files are very different, you can align the place of interest to where you want to add the similar code and use the original to see what has changed etc.

My work may be chaotic, but it would also be much more error-prone w/o this feature!-) Basically I don't see how any coder lives without it. Doing this "manually" is just error-prone (but in my experience, people who don't know of this feature/functionality simply are ignorant to the process/workflow of actually checking these types of diffs and pay for it with bugs).

Peter
-----Original Message-----
From: Stefan Küng [mailto:tortoisesvn@gmail.com]
Sent: Thursday, October 12, 2006 11:59 AM
To: users@tortoisesvn.tigris.org
Subject: Re: Feature request: Align manually feature for both diff and merge

Bas Bossink wrote:
> First of all I would like to say that I like TortoiseSvn very much. I
> use a diff tool from scooter software
> (http://www.scootersoftware.com/) called Beyond Compare as my main
> diff tool. It has 1 unique selling point which is: Align Mannually.
> This is the possibillity to instruct the diff tool to match two lines
> manually and restart the diff taking

What do you mean with "match two lines manually"? Does that mean you mark two lines as identical and redo the diff?

> the users hint into account. I would very much appreciate such a
> feature in the standard TortoiseSvn diff and merge tools.

That depends on what you need this feature for. Can you give an example where this feature is needed? I don't see the point in showing two lines not as different but equal - you could just ignore the different lines?

Stefan

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: users-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: users-help@tortoisesvn.tigris.org
Received on Thu Oct 12 21:19:13 2006

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