On Tue, Mar 8, 2011 at 1:12 PM, Richard Hipp <[email protected]> wrote:
> > > On Tue, Mar 8, 2011 at 12:44 PM, Jan Danielsson < > [email protected]> wrote: > >> Hello, >> >> Anyone here using meld[1]? >> >> When merging with many conflicts I find meld to be of invaluable >> help, though I noticed that meld is missing explicit fossil-support. >> > > Is meld more than just a visual 3-way merge tool, like xxdiff or kdiff3? > > Can meld be plugged into Fossil using the "gmerge-command" setting? > While we're on the subject, should the gmerge-command setting be extended to be "smart" about commonly used graphical merges. Should you be able to say just: fossil setting gmerge-command kdiff3 and fossil would know to add the "%baseline" "%original" "%merge" -o "%output" arguments onto the end automatically? Similar automatic arguments would apply to xxdiff and meld, perhaps? Or is that a case of the software trying to be too clever? > > > >> >> To make a pretty short story even shorter, I'm new to fossil and I >> never opened a meld vc-plugin in an editor before today. But I put >> together the attached file (heavily based on the monotone-plugin (don't >> mind the left-overs)). I tried it with meld 1.5.0, and it appears to be >> working[2] (though my tests are extremely limited). If anyone has any >> suggestions for improvements, let me know. I'm going to clean it up >> (specifically the _get_dirsandfiles() method), and then send it to the >> meld-folks, but if there's any feedback to be heard from fossil users >> first, I'd like to hear them. >> >> Specifically I'd like to know: >> - What states (which could be relevant to meld) are missing from the >> state_map? >> - Any obvious missing *_command()'s? (I don't know how one would >> translate "resolved_command()" to fossil, so I simply disabled it). >> >> On a slight tangent; my reading and testing of meld-plugins did yield >> a question concerning the states in fossil: I noticed that some VC's >> have support for a "added yet missing" state. I tried adding a file to a >> fossil repository, then removed the file from the file system (using >> regular rm), and "fossil ls -l" showed the file as "ADDED" rather than >> "MISSING". Is this by design, or is it an oversight? (I realize it's a >> situation which should happen, but let's say someone does something >> bizarre..). The fossil-plugin for meld could rescan all "added" files to >> see if they actually exist, and set them to "missing" if they have >> disappeared. But I can't shake the feeling that "fossil ls -l" should be >> picking it up. Thoughts? >> >> [1] http://meld.sourceforge.net/ >> [2] Just drop fossil.py into meld's vc/ directory >> >> -- >> Kind regards, >> Jan Danielsson >> >> >> _______________________________________________ >> fossil-users mailing list >> [email protected] >> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users >> >> > > > -- > D. Richard Hipp > [email protected] > -- D. Richard Hipp [email protected]
_______________________________________________ fossil-users mailing list [email protected] http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
