Re: Mercurial: automatically merge ChangeLogs

MikeK> I can't remember if the xmerge script specified a file, or if it MikeK> just invoked gnuclient with -eval. Probably the latter. I'll MikeK> play with it and report back. Okay, I played around with it, and I don't know how to make the frame management work right. This invocation: $ gnuclient -eval "(ediff-files \"/home/kupfer/tmp/foo.c\" \"/home/kupfer/tmp/bar.c\")" foo.c gives me a frame with foo.c, but there's no sign of bar.c or the Ediff control panel. This is with ediff-window-setup-function set to 'ediff-setup-windows-plain (my preferred setting). If I have ediff-window-setup-function set to 'ediff-setup-windows-multiframe, the same invocation creates an extra (unwanted) frame, plus it hijacks an existing frame if one is already open. I suppose I could hack up something based on "gnuclient -eval ..." (i.e., don't specify a file to visit), and use the existence of a temp file to indicate that the Ediff session is still in progress. Then use ediff-quit-session-group-hook to delete the temp file. But a little experimentation suggests that I'll still run into the same sort of frame/window management issues as above. Still, I suppose that might be preferable to starting a fresh XEmacs instance, particularly if I'm ssh'd into my work desktop from home. mike _______________________________________________ XEmacs-Beta mailing list XEmacs-Beta(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta