[resend with corrected scm-migration list. -mdk]
>>>>> "Rich" == Richard Lowe <richlowe at richlowe.net> writes:
Rich> As far as 222, is there anything else needed/wanted there? What's
Rich> there now are the bits mentioned in the RFE, and some extra bits
Rich> I've wanted (first/previous/next/last [unresolved]
Rich> [parent|child]).
I just listed in the RFE the operations that I most cared about.
Here are the menus in FileMerge:
File>
Open...
Save
Save As...
Exit
Edit>
Undo>
Last Resolved
Selected
All
Mark Selected as Resolved
Mark Remaining as Resolved
Accept Child to End of File
Accept Parent to End of File
Options...
Navigate>
Next>
Difference
Resolved Difference
Unresolved Difference
Left Difference
Right Difference
Previous>
(same as Next)
Selected Difference
First Difference
Find
Goto Line
Options>
(...)
TeamWare>
(entries to invoke various Teamware/Studio applications)
Plus these command buttons:
Open
Save
Mark (I'm not sure what that does)
Undo
Looking at this list, I think we'll eventually want "Save As". Some of
our source files are large enough that I don't trust copy/paste to work
flawlessly. Of course, this isn't a navigation option, so feel free to
ignore "Save As" for now.
Distinguishing the different Undo operations would be nice, but I
expect that manual cut/paste is probably adequate for now.
You've already done "next/prev unresolved".
I don't know what "Selected Difference" does, so I expect we can ignore
it.
Some sort of Find capability would be nice. But I don't think it's a
requirement for moving to Mercurial, and it certainly doesn't need to be
part of your current wad.
mike
