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

[TSVN] Re: TortoiseMerge: Editing conflicts

From: Simon Large <slarge_at_blazepoint.co.uk>
Date: 2004-09-23 10:26:22 CEST

"Dave Eccleston" wrote
> I absolutely love the three-panel view for resolving conflicts in
> TortoiseSVN. However, sometimes it is not appropriate to pick theirs or
> yours, but you want a combination of both. It would be nice if
> TortoiseMerge would allow a user to enter arbitrary text as the result
> of conflict resolution.

It would be nice, but I think asking TMerge to be an editor as well as a
diff/merge tool is too much - editors are complex beasts. Also, keeping
track of added and deleted lines in yours, theirs and merged when the user
is making edits as well sounds like a nightmare to me.

I have put in a request to allow TMerge to do a partial resolve, that is
resolve the easy lines using yours/theirs, and allow you to save with the
remaining conflict markers still in place, so that you can use your
favourite editor to sort out the harder bits afterwards. But I think even
that is not a trivial change.

However, changes like this will not happen now until after the next major
release. TSVN is in resource freeze until then so that the translations
stand some chance of getting finished.

Simon

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Sep 23 12:21:50 2004

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