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

[TSVN] Re: Re: Re: TortoiseMerge: Editing conflicts

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-09-27 14:40:35 CEST

"Hughes, Bill" wrote:
> You can't be much more responsible for the data if you're already doing
> automatic merges.
> I don't think there's a lot of difference between an editor or a merge
tool
> in terms of it being something that has to be working properly.

Yes, that's true, but at the moment it is just dealing with fixed arrays of
lines. Once you start inserting, deleting, splitting lines, etc., whilst at
the same time keeping tabs on the original source file which has those
SVN-generated conflict markers in, it becomes that bit more difficult to
manage. All day-to-day stuff for an editor of course, but a bigger worry
factor nonetheless.

And once you start editing within lines, you have to think how to treat tabs
and spaces. If it treats white space differently to your usual editor (and
this is one of my biggest gripes with a lot of IDE editors) you can get your
source in a mess without realising it.

> IMHO a little editing ability is a good thing but if you need something
> complicated you should get out of the diff tool to do it, others will
> disagree.

I agree with that. There are times when I would like to be able to do a
simple edit in TMerge, but once you open the floodgates ...

There is a place for a fully featured diff/merge/edit tool, but I think
TMerge is not that tool.

Simon

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Sep 27 15:57:30 2004

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