[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: undo weirdness with insert-file-contents
From: |
Stefan Monnier |
Subject: |
Re: undo weirdness with insert-file-contents |
Date: |
Fri, 07 Mar 2008 17:04:18 -0500 |
User-agent: |
Gnus/5.13 (Gnus v5.13) Emacs/23.0.60 (gnu/linux) |
> martin, who still considers the non-VISIT&REPLACE case obscure and
> cannot see any "example" in `smerge-resolve'.
Ahem... sorry, it's in the part of smerge-resolve that I haven't
yet installed. Basically what it does is this:
given a 3-way merge conflict, with 3 branches MINE/BASE/OTHER, I do
a narrow-to-region on the conflict, then I save all three branches of
the conflict to separate files and do:
diff -c -w BASE MINE | patch OTHER >RESULT
and if the patch succeeds I do `insert-file-contents' of RESULT without
VISIT but with REPLACE.
It's indeed somewhat obscure, and indeed, it crashed Emacs when the
Unicode branch was merged (because the code didn't expect REPLACE in
a narrowed buffer).
Stefan
- Re: undo weirdness with insert-file-contents, Stefan Monnier, 2008/03/02
- Re: undo weirdness with insert-file-contents, martin rudalics, 2008/03/02
- Re: undo weirdness with insert-file-contents, Stefan Monnier, 2008/03/02
- Re: undo weirdness with insert-file-contents, martin rudalics, 2008/03/02
- Re: undo weirdness with insert-file-contents, Stefan Monnier, 2008/03/02
- Re: undo weirdness with insert-file-contents, martin rudalics, 2008/03/03
- Re: undo weirdness with insert-file-contents, Stefan Monnier, 2008/03/03
- Re: undo weirdness with insert-file-contents, martin rudalics, 2008/03/07
- Re: undo weirdness with insert-file-contents,
Stefan Monnier <=
- Re: undo weirdness with insert-file-contents, martin rudalics, 2008/03/08
- Re: undo weirdness with insert-file-contents, Bill Wohler, 2008/03/02
- Re: undo weirdness with insert-file-contents, martin rudalics, 2008/03/03