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

Re: Lock merge function into working copy

From: Stefan Küng <tortoisesvn_at_gmail.com>
Date: Sun, 20 Feb 2011 13:04:46 +0100

On 19.02.2011 17:30, Bernard TREMBLAY wrote:
> Hi,
> Into the FAQ we can find the subject : prevent Subversion from doing
> automatic merges?
> Some people don't like the fact that Subversion merges changes from
> others with their own local working copy changes automatically on
> update. Here's how to force those files into a conflicted state so
> you can merge manually at your convenience.
> 1. In TortoiseSVN->Settings->Subversion configuration file, click on
> the edit button. 2. Change the [helpers] section by adding diff-cmd =


> This is very usefull because when you use templates (smarty) and css
> any merge can generate a lot of work to make a manual merge and
> generally you have lost your original file.
> Then the lonely way to work is to lock the merge on the local worked
> copy and get the new updated into a<filename-with-.extension>.<new
> version>.<file extension> to make comparisons and solve manually
> conflict.
> Why such a name for the update file (new version not merged) ? 1- If
> we use the file name with extension into the dir the update file will
> be below 2- the extension is added because if not the external editor
> will not be able to hightlight and syntax analyse.

The filename is generated by the svn library, not TSVN itself. And the
reasone for that filename is to avoid situations where such a file
already exists locally and of course the extension is added so the file
is opened correctly by assigned apps.

> In another way there is a locking problem is that the expression :
> "[helpers]" section is an auto referenced expression reserved to
> initiated persons : I mean : search on the whole site on the word
> "helpers" neither in docs don't give any result : it is something
> hidden.

No, please read the faq again:
1. In TortoiseSVN->Settings->Subversion configuration file, click on the
edit button.
2 Change the [helpers] section by adding diff-cmd = "C:\\false.bat"
diff3-cmd = "C:\\false.bat" (note the double backslash)

So it should be very, very clear that the [helpers] section is in the
Subversion config file. I don't think we can make this any more clear
than it is.


   oo  // \\      "De Chelonian Mobile"
  (_,\/ \_/ \     TortoiseSVN
    \ \_/_\_/>    The coolest Interface to (Sub)Version Control
    /_/   \_\     http://tortoisesvn.net
To unsubscribe from this discussion, e-mail: [users-unsubscribe_at_tortoisesvn.tigris.org].
Received on 2011-02-20 13:04:59 CET

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