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

[TSVN] enhancement: resolve conflict: mass select

From: Leonard Ritter <leonard.ritter_at_steganos.com>
Date: 2005-07-15 16:20:59 CEST

it would be cool if it was possible to resolve more than one file in
explorer at once.

often we get binary "fake" conflicts when merging, where the new revision
clearly wins over the older one. especially for those cases, it should be
possible to mass-resolve conflicts, also recursively (as in: resolve all
binary conflicts in this subfolder).

i wrote a little python script that is able to do that for me, and it
relates to the bug i reported earlier. it however applies only to r0<->rXXX
conflicts.

its attached to this mail.

leonard

---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tortoisesvn.tigris.org
For additional commands, e-mail: dev-help@tortoisesvn.tigris.org

Received on Fri Jul 15 16:18:14 2005

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