It’s time to move the changes from the branch to the trunk. For clarity, I’ve marked the changed lines with a #trunk comment Merge Conflict Time Now let’s say someone else has been changing the trunk version of the file, like so: peach pie #trunk We’ve clearly marked the line changes with a #branch ‘comment’. We will now checkout and work on the branch, editing the branch’s test.txt in the branch so that it looks like this: peaches and cream #branch Now let’s create a branch to work on this privately with the following command: svn copy We will add a new file to the test directory called test.txt with the following contents: apple pie Let’s assume we have an svn repository at a url like this : I will use example addresses and locations for the svn urls. Let’s run through a bit of a contrived example of how this might be used. Also make sure your script has its executable script set by running: chmod +x ~/scripts/diffmerge/diffmerge-svnmerge.sh
Make sure your path is correct, and you should probably make it absolute. I’ll choose the latter, so open ~/.subversion/config and add a line under the section like this: merge-tool-cmd = /scripts/diffmerge/diffmerge-svnmerge.sh To do so, we can either set the SVN_MERGE environment variable to point to the path to the script or edit our subversion config file. Now, we need to get subversion to call this script at the right time. These are briefly described in a paragraph in here. I’m using this, and placing it in my home directory: ~/scripts/diffmerge/diffmerge-svnmerge.sh: #!/bin/bashĭIFFMERGE_PATH=/Applications/DiffMerge/DiffMerge.appĭIFFMERGE_EXEC=$ -nosplash -m -t1="Incoming Merge Changes" -t2="Original (merged)" -t3="Current Working Copy changes" -r="$4" "$2" "$1" "$3"Īs noted in the comments, svn will call this wrapper script with arguments. Next, you’ll need a little wrapper shell script to invoke DiffMerge from svn. Once you’ve downloaded the diskimage file, open it and you’ll see a DiffMerge.app directory.
Diffmerge tutorial download#
There’s some info in the manual, notably here and hereįirst, download diffmerge. I’ve always found merging a bit confusing, and to make matters worse, it’s not altogether straightforward as to how one gets SVN to use external merge tools.
Diffmerge tutorial mac#
I settled on trying Diffmerge: it was free, available on mac (and windows and linux) and seemed pretty feature rich. I looked around and found several merge tools. The time had come to start using a more graphical merge tool with svn.
Diffmerge tutorial code#
Since it wasn’t my code that conflicted and there were alot of conflicts over many, long lines, looking at svn’s diff output made me a bit confused and dizzy. Recently for a project, I had to merge some code into our main trunk in svn from a maintenance branch and ran into bunch of problems due to merge conflicts. I’m not a fan of conflicts, especially source control merge conflicts.
0 kommentar(er)
