Jim Walker <James.Walker at Sun.COM> writes: > Bonnie Corwin wrote: > >> - graphical merge tool: Needed for complicated merges. >> Believe filemerge works on hg workspaces; if so, ok if >> there are instructions. If want to finish gpyfm, need >> owner. > > BTW. > When I ran the hg test suite filemerge popped up on my desktop and > seemed to work, but I didn't take the time to do the correct merge > like the test suite expected yet. This run shows where the merge > tests occur (and fail). I also tried it with meld and it worked. > http://opensolaris.org/os/project/scm-migration/files/hg_tests_baseline_095.txt
filemerge does work, it's in real use. (however, the Hg test suite shouldn't really be throwing it at you..) > In addition, I'm in the process of porting meld to the SFW consolidation, > which is a nice two or three way merge tool that is python based. Meld > was on a list of things people wanted ported. > http://meld.sourceforge.net/ > > I assume we will be able to support several graphical merge tools > depending how you define "complicated merges". People can use whatever they choose to, we just need at least one which actually works. > Cheers, > Jim
