0.9.3 Works well on windows

[Darrell Gallion]

0.9.3 fixed a lot of my Windows complaints.

Quotes in Mercurial.ini confused me at first. The following worked.
cmd.ediff = C:\Program Files\ExamDiff Pro\ExamDiff.exe

Some nice to have things, would be:

1. Ablity to add an extension like forest.py to the Mercurail
directory with hg.exe

2. When using extdiff between the current working version and some other.
   Don't create a temp version of the current working version.
   Let me use ExamDiff to merge some feature from the other version
back to the working version.


Also our diff/merge tool ExamDiff isn't a three way merge tool.
So the following seems to work fine.

hgmerge.py
import sys, os

def main():
    buf1 = open(sys.argv[1]).read()
    buf2 = open(sys.argv[2]).read()
    buf3 = open(sys.argv[3]).read()
    if buf1==buf3:
        return buf1

    if buf2==buf3 and buf1 != buf2:
        return buf1

    if buf1==buf2 and buf3 != buf2:
        return buf3

    os.system("examdiff %s %s"%(sys.argv[1], sys.argv[3]))
    return open(sys.argv[1]).read()

buf = main()
if buf != None:
    open(sys.argv[1],'w').write(buf)



Thanks
--Darrell
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.mercurial-scm.org/pipermail/mercurial/attachments/20061220/a7ee15c2/attachment-0001.html>