Resolve subversion conflicts with Araxis Merge
I am a big fan of Araxis Merge and I also use svnmerge.py quite often. Lately I run into a bunch of nasty conflicts that weren't so easy to resolve. I wrote a little script that you can execute in the current directory to open all conflicting files in Araxis.
It opens the file diff with your working state on the left and the subversion state on the right. If you save it saves to the "real" file. You still need to execute svn resolved afterwards.
#!/bin/bash
OPTS="-2"
for FILE in `svn st | grep '^C' | awk '{print $2}'`; do
/usr/local/bin/compare $OPTS "${FILE}.working" "${FILE}.merge-right"* "${FILE}"
done
You probably need to adjust the path to compare. I specified the full path here since Image Magick has the same command. You can add additional options like -wait to the OPTS variable to resolve one file after another.
PS: I hope someone from Araxis reads this and renews my support which is running out soon :)
