Thu Nov 17 15:49:24 GMT 2005 Dave Love <[EMAIL PROTECTED]>
* Emacs ediff-merge example and explanation of --external-merge.
New patches:
[Emacs ediff-merge example and explanation of --external-merge.
Dave Love <[EMAIL PROTECTED]>**20051117154924] {
hunk ./Resolution.lhs 73
-merged, \verb!%a! is replaced with the common ancestor of the two version.
+merged, \verb!%a! is replaced with the common ancestor of the two versions.
hunk ./Resolution.lhs 85
+
+% Fixme: Is it actually a shell command on MS Windows?
+Note that the command is split into space-separated words and the first one is
+\verb!exec!ed with the rest as arguments---it is not a shell command. Also
+the substitution of the \verb!%! escapes is only done on complete words.
+This means that to use Emacs' Ediff package for merging, for example, you need
+a helper script as follows; call it \verb!emerge3!, say:%
+% This is indented so that the leading #s don't confuse the preprocessor.
+\begin{verbatim}
+ #! /bin/sh
+ # External merge command for darcs, using Emacs Ediff, via server if possible.
+ # It needs args %1 %2 %a %o, i.e. the external merge command is, say,
+ # `emerge3 %1 %2 %a %o'.
+ test $# -eq 4 || exit 1
+ form="(ediff-merge-files-with-ancestor"
+ while test $# -gt 0; do
+ count=$count.
+ if [ $count = .... ]; then
+ form=$form\ nil # Lisp STARTUP-HOOKS arg
+ fi
+ case $1 in # Worry about quoting -- escape " and \
+ *[\"\\]* ) form=$form\ \"$(echo $1 | sed -e's/["\\]/\\\0/g')\" ;;
+ *) form=$form\ \"$1\" ;;
+ esac
+ shift
+ done
+ form=$form')'
+ ( emacsclient --eval "$form" || # Emacs 22 server
+ gnudoit "$form" || # XEmacs/Emacs 21 server
+ emacs --eval "$form" || # Relatively slow to start up
+ xemacs -eval "$form" # Horribly slow to start up
+ ) 2>/dev/null
+\end{verbatim}
+It would be invoked like:
+\begin{verbatim}
+--external-merge 'emerge3 %1 %2 %a %o'
+\end{verbatim}
+
}
Context:
[bump version to 1.0.5rc1
Tommy Pettersson <[EMAIL PROTECTED]>**20051117111128]
[Fixed documentation of DARCS_GET_HTTP with curl.
Daniel Bünzli <[EMAIL PROTECTED]>**20051117062547]
[add --dont-edit-description opposite to --edit-description.
David Roundy <[EMAIL PROTECTED]>**20051116115632]
[Flag superfluous input using Test::Builder
Florian Weimer <[EMAIL PROTECTED]>**20051112160533
This change makes sure that the test case that triggers this error
condition fails in a clean way (especially if test planning is not used,
but it should work with plans as well).
]
[English and markup fixes.
Dave Love <[EMAIL PROTECTED]>**20051114224845]
[update web page to reflect 1.0.4 as latest stable source.
David Roundy <[EMAIL PROTECTED]>**20051113210144]
[TAG 1.0.4
David Roundy <[EMAIL PROTECTED]>**20051113134431]
Patch bundle hash:
638da0f3e756393d3929196ec4499ea756458608
_______________________________________________
darcs-devel mailing list
[email protected]
http://www.abridgegame.org/cgi-bin/mailman/listinfo/darcs-devel
