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

Re: [TSVN] TMerge and partial resolve

From: SteveKing <steveking_at_gmx.ch>
Date: 2004-09-27 18:58:07 CEST

Simon Large wrote:

> 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.
>
> 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.

Done in revision 1730.

Stefan

P.S. I had to violate the resource-freeze for that. So I may as well
start adding things to the resources now. Sorry for the translators, but
now that I have some time to work on TSVN I just don't want to be held
back because of a resource freeze.

-- 
        ___
   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.tigris.org
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Mon Sep 27 20:07:25 2004

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