Op 11-4-2012 21:15, Enrico Forestieri schreef:
On Wed, Apr 11, 2012 at 08:52:16PM +0200, Kornel Benko wrote:
Am Mittwoch, 11. April 2012 um 20:39:23, schrieb for...@lyx.org
Author: Enrico Forestieri<for...@lyx.org>
Date: Wed, 11 Apr 2012 18:19:11 +0200
New Commit: 99fe8ef2bacbcbeb1508a911a52845cc1b71c486
URL:
http://git.lyx.org/?p=lyx.git;a=commit;h=99fe8ef2bacbcbeb1508a911a52845cc1b71c486
Log:
Use the right latex backend when a converter needs aux files.
If a converter specifies the needaux flag, latex (or xelatex) is
always run to produce the needed auxiliary files. This is wrong
because there are documents that can only be compiled with a specific
backend and thus the conversion may fail. On the other hand, even if
the document specifies the backend to be used, LyX ignores this info.
This commit rectifies this behavior by letting LyX run the same flavor
of the latex backend that shall be used for previewing the document
also for producing the auxiliary files.
(cherry picked from commit 3285ce1d5cb9ba79af700d004401115269e97ada)
Conflicts:
src/Converter.cpp
Branch not compilable now.
The of joy of git... something similar had never occurred to me in many
years using svn. I used cherry-pick and there was a conflict, so I
launched git mergetool and found myself in gvimdiff with 4 windows
opened on different versions of the conflicting file. I had never used
(and had any need to use) gvimdiff, so it took sometime to understand
what to do. Found the conflict markers and choose how to modify it.
However, I forgot to replace a closing ")" with a "," and thus...
I don't want to repeat it, but if I had simply applied a diff from trunk
I would not have had any conflicts and everything would have gone more
smoothly and in less time.
When using svn, you will get merge conflicts as well. How you fix them
is completely up to you. It would have taken 2 seconds to fix the
conflict using vim or the like. You're in no way forced to use 'git
mergetool' or 'gvimdiff'.
Vincent
