[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: Stefan Küng <tortoisesvn_at_gmail.com>
Date: 2005-09-01 22:13:06 CEST

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.

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


   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 Thu Sep 1 22:13:23 2005

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