[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2006-10-16 21:12:05 CEST

Let me put two paragraphs of your last mail together:
Peter Yamamoto wrote:
> I've decided to try and avoid the personal barbs, it's just way out
> of line/context.
> You are really showing your intent for personal attacks at the
> expense of your credibility.

Yeeees, you really are avoiding personal barbs...
Seriously, do you have a problem? Please read my previous answer again:

>> 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.

I clearly answered to your example "when two users do similar stuff"!
What you mention below are completely different scenarios which really
can't be solved in a better way.

> Getting conflicts is a common occurrence in many types of
> projects/scenarios.

Next time, just mention those in the first mail.

> For example, in a scripted environment, where the scripting language
> does not allow for easily hiding multi-platform dependencies, and you
> have multiple teams working on the different platforms, all under
> tight schedules, then you will often encounter people hitting the
> same section of code, causing conflicts.
> This is neither poor communication, nor poor scheduling, and in
> reality, the conflict isn't or shouldn't be that hard to resolve. The
> issue of difficulty is however based on the tools as illustrated by
> some of the examples.

Do you always take an answer personally?

> Another scenario is when refactoring a large code base. Again, some
> collisions may occur as different people refactor different systems
> that are closely related at a higher level. Again, this does not
> reflect serious communication problems.

Again, this is a different scenario than the one you mentioned before.

But my point below is still valid:

> 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.

Of course, if you provide a patch for this I'd be happy to apply and
commit it.


   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 21:12:16 2006

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.