Click here to Skip to main content
Click here to Skip to main content

Tagged as

Prevent Subversion from doing automatic merges

, 14 Feb 2011
Rate this:
Please Sign up or sign in to vote.
This tip shows how to prevent Subversion (a version/source control tool) 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 = "C:\\false.bat" diff3-cmd = "C:\\false.bat" (note the double backslash)
 
3. Create the file C:\false.bat which contains two lines
 
4. @type %9@exit 1.
 
This effectively makes auto-merge fail every time, forcing the file into conflict.
The reason for the curious 'type %9' line is that the diff3-cmd sends the merged output to stdout.
Subversion then takes this and overwrites your local file with the merge results.
Adding this line avoids getting an empty local file.

License

This article, along with any associated source code and files, is licensed under The Code Project Open License (CPOL)

Share

About the Author

Mukit, Ataul
Chief Technology Officer Rational Technologies
Bangladesh Bangladesh
You don't learn patterns, you just code it.
Follow on   Twitter

Comments and Discussions

 
GeneralThnx... I actually got it from someone else and he didn't gi... PinmemberMukit, Ataul21-Feb-11 4:28 
GeneralIf you just copy'n'paste from the TortoiseSVN FAQ, have at l... PinmemberSteveKing20-Feb-11 22:07 
GeneralRe: If you just copy'n'paste from the TortoiseSVN FAQ, have at l... Pinmemberzincrich25-Apr-14 1:08 

General General    News News    Suggestion Suggestion    Question Question    Bug Bug    Answer Answer    Joke Joke    Rant Rant    Admin Admin   

Use Ctrl+Left/Right to switch messages, Ctrl+Up/Down to switch threads, Ctrl+Shift+Left/Right to switch pages.

| Advertise | Privacy | Mobile
Web02 | 2.8.140827.1 | Last Updated 14 Feb 2011
Article Copyright 2011 by Mukit, Ataul
Everything else Copyright © CodeProject, 1999-2014
Terms of Service
Layout: fixed | fluid