Mike Kupfer wrote: > [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...
That'd be good. > Exit > Edit> > Undo> > Last Resolved > Selected > All I very much want these distinctions, and looked into implementation, it *looked* like these would be complicated by hand-edits of the merge buffer. > Mark Selected as Resolved > Mark Remaining as Resolved Is this effectively an "accept ancestor"? > 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 I think I covered all these (but with different menu structure), except for Selected Difference, and * Resolved Difference. > Plus these command buttons: > > Open > Save > Mark (I'm not sure what that does) Stuff it to the X selection for copy/paste maybe? (it's the best guess I have) > 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. Why would you be copy/pasting? > 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. I would imagine it'd scroll the view to the currently selected chunk (as a quick-way to re-find the current point after free scrolling). Even if it's not, that's a feature I'd like. -- Rich
