Sunday, December 2, 2012

libgdx and iOS deployment quest - Part IV

I discovered that my installation of TortoiseHg was not 100% complete.  I had not installed kdiff3 or added any of the necessary configurations to get that tool to work.  The net result was that I was not able to do any sort of merges or "diff to local" type operations.  After a bit of hunting, there are additional configurations that you need to implement after installing kdiff3.

To wit:

1) Install kdiff3 from
2) Update your .hgrc similar to below:

hgext.bookmarks =
hggit =
mq =
hgext.extdiff =
cmd.kdiff3 =
kdiff3.args = $base $local $other -o $output
kdiff3.args=--auto --L1 base --L2 parent1 --L3 parent2 $base $local $other -o $output
kdiff3.diffargs=--L1 '$plabel1' --L2 '$clabel' $parent $child
kdiff3.diff3args=--L1 '$plabel1' --L2 '$clabel' --L3 '$plabel2' $parent1 $child $parent2
;kdiff3.diff3args=--L1 '$alabel' --L2 '$plabel1' --L3 '$plabel2' $ancestor $parent1 $parent2 -o $child