[TSVN] TMerge and partial resolve (again)

This is a retransmit of one I sent on 9 Sept.

Build 1662 (still true in 1684)

TMerge provides a very easy way of resolving conflicts visually by selecting
mine/theirs/both from the changed sources and it works brilliantly most of
the time. However, there will always be some cases which cannot be resolved
so simply and will require further hand editing to resolve.

If I try to resolve the easy bits using TMerge and leave the one tricky
section for hand editing, TMerge will not let me save my changes. It only
accepts a complete resolve or none at all. It would be nice if it warned me
that there are still unresolved sections, but let me save anyway, leaving
the remaining conflict markers in place for hand editing.

In the meantime there is a minor bug in the close logic. If I resolve 90% of
the differences and miss one, then click on the close box, I get a "do you
want to save changes yes/no/cancel" box. I click on Yes, then TMerge tells
me there are unresolved conflicts and discards all the changes anyway.

Simon.

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Sep 20 16:10:25 2004