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

Re: Feature request: Option to disable autmatic merges when updating the w.c.

From: Oto BREZINA <otik_at_printflow.eu>
Date: Thu, 23 Aug 2012 17:06:25 +0200

On 2012-08-23 16:55, Stefan Küng wrote:
> On Thu, Aug 23, 2012 at 10:42 AM, Markus Humm
> <markus.humm_at_de.ebmpapst.com> wrote:
>> For software projects, it might make sense to have the possibility to deactivate automatic merges when updating the working copy. In this case EVERY file that has been changed both in the working copy and in the repository since the last update would result in a conflict, that must explicitely be resolved by the SVN user.
>> In that case the conflict editor would be opened for that file.
> http://tortoisesvn.net/faq.html#noautomerge
Besides this, is there option to set Specific tool for one extension?
We use project files too, and it is XML where lines are shufled after
every save. So before commit we "normalize it" - I set client side hooks
for this. However in some cases (that is for other email) update hook is
not called and we end up with quite a mess. All I need is run other tool
before merging for files with specific extension.

I use work around: clean up *.mine and resolve conflict afterwards.

Oto ot(ik) BREZINA - 오토
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2012-08-23 17:06:50 CEST

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

This site is subject to the Apache Privacy Policy and the Apache Public Forum Archive Policy.