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

RE: Re: Re: TortoiseMerge Tool request

From: <webpost_at_tigris.org>
Date: Tue, 28 Apr 2009 09:18:39 -0700 (PDT)

Thanks again.

The idea is that some of the authors will not even use svn... and I would like to merge their changes into my file manually and then commit it.

Maybe what I propose doesn't quite sound like what svn supporters consider to be ideal, but it's real life.

With the nice kdiff3 and it's interface, or maybe emacs, roughly speaking all that we miss is:

A script that tries to match Mine with Yours word-by-word, and then applies all the spacing, and line breaking from Mine to Yours whenever they are equivalent. (As I said before, for LaTeX it's normally the case that k spaces is equivalent to 1 space which is again equivalent to 1 line break, and k+1 line breaks is equivalent to 2 line breaks.)

It's not exactly just this because in some situations a line break matters, but I would pay the price of fixing it manually.

In summary, it's a script to import someone's file to the layout standard.

Usually the situation is: part of the team do not want to hear about "svn" or "layout standard". This is really out of question. Unfortunately.

And that prevents me from using svn :-(

If it could be incorporated, I'm sure that on the spot get a huge amount of latex users would choose svn as their rcs just because of this feature.

------------------------------------------------------
http://tortoisesvn.tigris.org/ds/viewMessage.do?dsForumId=4061&dsMessageId=1965419

To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2009-04-28 18:21:02 CEST

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