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

Re: [TSVN] And while I'm on feature requests: merge result dialog...

From: Joseph Galbraith <galb_at_vandyke.com>
Date: 2005-09-01 22:37:11 CEST

Stefan Küng wrote:
> Joseph Galbraith wrote:
>> Better integration with TMerge :-)
>>
>> Would it be possible to have TMerge return a special
>> status code when a merge is resolved-- then the
>> merge result could notice this and mark the file
>> as no longer conflicted and decrement the count
>> of conflicting files.
>>
>> It would be nice if the merge result dialog
>> kept track of what I've already fixed for me
>> and what I still need to fix.
>
> That would mean inter-process communication. Not really hard to do, but
> again it would be limited to TMerge and maybe break other diff tools.

You'd have to associate the TMerge process handle
with each entry ... and check if the handle is
signaled every so often and fetch the result status
if it is... so certainly not trivial...

And my other response applies here: TMerge should
work better with TSVN and provide more features
than any other diff tool precisely because we control
the code for both.

>> In addition, right-click "use their file, use my file"
>> menu entries would be a big boon (I though I saw this
>> go in... so maybe I just need to upgrade to the latest.)
>
> That's something I could do. Give me some time though...

Thank you! No pressure... I got not right to demand it
tomorrow... especially since I'm not volunteering a
patch :-)

Thanks again,

Joseph

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Thu Sep 1 22:29:10 2005

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