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

Re: [TSVN] Auto Resolve After Merge

From: Stefan Küng <stefan.kueng_at_wagner-group.ch>
Date: 2004-09-06 11:35:27 CEST

Eric J. Smith wrote:

> I really like how TortoiseMerge will auto resolve a conflict after editing
> the conflicts and I'm wondering if I can also get this to work with external
> merge programs (Araxis Merge)? Is this possible and I'm missing something?

Run
TortoiseProc.exe /command:resolve /path:"path/to/resolved/file"
from your merge tool.

> If it is not currently possible, could this be added? Maybe you could
> simply check to see if the file has been modified after the external merge
> tool exits?

That would mean that TSVN has to wait until the external merge tool
exist? That means TSVN would be running the whole time?

Stefan

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org
Received on Sat Sep 11 20:14:01 2004

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