This is version one of the patch to enable full 3-way diff support in visdiff, compatible with the extdiff extension (and with code mostly from there).
It seems to work, and I tested it in various configurations of file status vs. parent 1 and 2: M -, - M, M M, A -, - A, A M, M A, A A, R -, - R, R R All this works. I have changed the invocation code a bit since the previous version probably didn't work correctly on POSIX in all cases, and didn't use shell execute which extdiff does. It should now work correctly, but I didn't test on POSIX. I also removed the connection from signal 'response', since it leads to visdiff trying to remove the temporary directory twice if I leave it in. I don't know enough about GTK to know why this is the case. If someone else could test the patch, especially on POSIX, it would be great :) /Sune ------------------------------------------------------------------------------ Come build with us! The BlackBerry(R) Developer Conference in SF, CA is the only developer event you need to attend this year. Jumpstart your developing skills, take BlackBerry mobile applications to market and stay ahead of the curve. Join us from November 9 - 12, 2009. Register now! http://p.sf.net/sfu/devconference _______________________________________________ Tortoisehg-develop mailing list Tortoisehg-develop@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/tortoisehg-develop
