>>>>> "Jim" == James Carlson <james.d.carlson at sun.com> writes:
Mike> I'm a little concerned about the bigger picture, though. I guess Mike> we're assuming folks will be able to use meld for a GUI merge tool. Mike> Which is okay with me, as long as we're willing to gate our putback Mike> on Mike> Mike> 6648443 meld to be included into SFW consolidation Jim> At least for 461, I see that as a separate problem. 461 is about Jim> internal review of the bits that we're delivering. I agree with you about what 461 covers, but I want to make sure we're all on the same page about what we're delivering. I *don't* want to be saying we're ready for code review, except the fine print says we still have some development work to do, like a merge GUI. Jim> Having a GUI is (I think) about making contributions from the Jim> outside more plausible than they are today. Lack of a GUI is a serious regression from the current TeamWare-based environment. Internal developers can use FileMerge, but I was concerned that we might have to write a wrapper. But now that I reread Matt's email about the new merge configuration syntax, it looks like a wrapper will be unnecessary. We'll still need to make some changes to hgsetup. Since those changes should be just a couple lines, and they'll be difficult to test without Mercurial 1.0, I don't think they need to block the code review. mike
