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

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

From: Simon Large <simon_at_skirridsystems.co.uk>
Date: 2006-10-16 22:17:02 CEST

Stefan Küng wrote:
> Peter Yamamoto wrote:
>> If you have not had the pleasure of a manual align, I highly suggest
>> you download beyond compare and try it.

I have never used BC, but I believe you :-)

>> 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).
>
> From my point of view, if two users do similar stuff you have bigger
> problems than diffing those files. That means you have serious problems
> with communication in your team.

Still useful when one user moves a block of code. I sometimes do that,
and the diffs are no longer very helpful.

<snip>

> I think that such a feature is way out of TMerge's league. We should
> keep TMerge simple - for such complicated features you can use
> commercial tools.

This is the crucial point. We get all sorts of requests for TMerge, like
being able to edit the files directly in TMerge, and this one for
re-alignment. Yes it would be great of it could do that, but it is a
huge task, and frankly if you love BC because it can do that, then use
BC. That's why we provide an interface to 3rd party diff/merge tools. If
that interface is not adequate, then tell us why. TMerge was designed as
an applier of Subversion patches, because there was no other program
which did. If there had been another suitable program, then TMerge would
probably not exist at all.

Simon

-- 
        ___
   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
Received on Mon Oct 16 22:17:23 2006

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