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

RE: Re: TortoiseMerge Tool request

From: Todd C. Gleason <tgleason_at_impac.com>
Date: Tue, 28 Apr 2009 09:15:19 -0700

> -----Original Message-----
> From: Simon Large [mailto:simon.tortoisesvn_at_googlemail.com]
> Sent: Tuesday, April 28, 2009 9:53 AM
> To: users_at_tortoisesvn.tigris.org
> Subject: Re: Re: TortoiseMerge Tool request
> 2009/4/28 <webpost_at_tigris.org>:
> > Hi,
> >
> > Thanks for the answer.
> >
> > Sorry, my message was not well written...
> >
> > Many text editors break lines and many users like it for some
> >
> > A LaTeX document has big paragraphs and for the latex compiler it
> no difference if it's a huge line of if it's broken into many. And the
> users often think a line break is appropriate at some places while
> users will rather put line wraps elsewhere.
> >
> > I am fine with my text editor, but I'm not willing to try and
> all my co-authors to change theirs.
> >
> > I just thought it would be more productive if an automatic tool
could do
> it than if every latex user have to argue with the whole team of
> collaborators and convince each one of them to change their habbits.
> >
> > Afterall, what happens is that one person trying to stick to decent
> standards, use free software, do a nice version control, etc., finds
> task too hard due to the very lack of simple tools that would make
> way of working compatible with that of people that just don't care.
> >
> > That's why I wondered if there is ever such a tool.
> Subversion doesn't work like that. It cannot simply ignore line breaks
> - they are a real change to file content, even if your compiler
> ignores them. If you are all using subversion and can't agree on a
> layout standard then your repository is going to be a mess.

Although that's true, TortoiseMerge already offers a means to ignore
whitespace. Ignoring EOLs seems much the same, though no doubt the
implementation is trickier.

Consider that you might be able to have one or more regular expressions
defined on a per-extension basis that would be used to ignore parts of
the file. You could configure this then to ignore newlines, or other
"garbage" such as generated time stamps, checksums, and so on.
Internally TortoiseMerge would automatically resolve these such that it
would use the data from one of the files (probably the "mine" file,
though maybe it should be configurable). We do something similar here
using Araxis.


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

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