From: Lieven G. <lg...@mo...> - 2006-10-17 21:13:29
|
Quoting Joachim Eibl <joa...@gm...>: > Hi Som-Som, > > Tortoise-SVN integration: > Thanks for the bat-file. I can add the file in the installation package, and > I > also might be able to install it automatically for the installing user, but > not for every user unless you have an idea in that respect. I think this change goes a bit too far. The diff3 algorithm is embedded in the Subversion client libraries (on which TSVN relies) and is the standard way Subversion merges changes from the repository in the working copy. The merge is executed automatically and only if there are merge conflicts Subversion creates a set conflict files which should be manually solved by the user (with KDiff3). I can understand some people want to override this standard 'merge automatically' behavior but I guess for most people the standard behavior is sufficient. So, if you want to add it to KDiff3, can you make it: a. optional b. disabled by default c. not part of the TSVN integration option In fact (this is obviously my personal opinion) I'd like not to give my users this option, because it's definitely going to confuse them and if they enable it it'll generate a flood of support requests. Lieven. ---------------------------------------------------------------- This message was sent using IMP, the Internet Messaging Program. |