On Sat, Sep 19, 2020 at 05:55:13PM +0200, Thibaut Cuvelier wrote: > On Sat, 19 Sep 2020 at 14:48, Kornel Benko <kor...@lyx.org> wrote: > > > Am Sat, 19 Sep 2020 14:44:25 +0200 > > schrieb Kornel Benko <kor...@lyx.org>: > > > > > Am Sat, 19 Sep 2020 14:28:59 +0200 > > > schrieb Kornel Benko <kor...@lyx.org>: > > > > > > > Am Sat, 19 Sep 2020 12:41:47 +0200 > > > > schrieb Kornel Benko <kor...@lyx.org>: > > > > > > > > > Also the test export/doc/de/UserGuide_xhtml fails here. > > > > > Assertion triggered in void lyx::doAssertWithCallstack(bool) by > > failing check > > > > > "false" in file > > /usr2/src/lyx/lyx-features/src/support/lassert.cpp:44 > > > > > > > > Debugger shows problem in src/support/docstring.cpp:54 (in > > from_ascii()) > > > > LATTEST(static_cast<unsigned char>(ascii[i]) < 0x80); > > > > > > > > The tested string is utf-8 encoded, so wrong call. > > > > > > > > Called from src/xml.h:187, with following values > > > > tag = "a" > > > > attr = "href=\"https://de.wikipedia.org/wiki/Regulärer_Ausdruck\""; > > > > > > > > Apparently the attr contains non-ascii. > > > > > > > > Kornel > > > > > > > > > > Test passes with attached > > > > > > Kornel > > > > The nice thing is that also the other tests pass now. > > > > Nice :D!
Nice indeed! Great work, Kornel and Thibaut. > I've committed your patch on my branch > (1b9da1fcac5c9c4ecfdf7eb2d64e841c9bf40217), then rebased on top of current > master (f55bd760960d2ef109d1583396e1944038121854). I just fetched origin/master and do not see f55bd760. That commit is in features repo only I think. > Did I make a mistake? (Before merging this into master and creating > problems for everyone…) While rebasing, Git worked on more than 400 > commits, although I did not make that many commits, that's why I ask. I suggest you do the following: 1. Copy your directory to a backup directory somewhere outside of the git directory. This way, you have a full backup (because everything is stored in the .git subdirectory) in case the rebase has problems so you can always go to your backup until you push. 2. Do a git checkout of origin master. pull origin master. Make sure when you do "git status" everything looks clean and up to date. 3. Do a git checkout of your docbook branch. Check git status to see if it clean. Then rebase on top of master. I just did this and there were conflicts that need to be resolved, which to me suggests that something did indeed go wrong with the commands you did. If in doubt, save the commands you did and the output so you can send them and we can take a look. From what I understand, if (3) goes well, then the latest commit hash of master should be in the history of your docbook branch. That is, if you do "git log" on your docbook branch and search (e.g., with '/'), you should be able to find the hash from origin master's HEAD. Once this is the case, I think you're ready for the next step: 4. Checkout master. Do "git merge --no-ff <your docbook branch>". In my opinion, the "--no-ff" is very important. Otherwise, a fast-forward merge will complicate future git bisects. I don't know git that well, so if others have advice, go with that instead of the above. Scott
signature.asc
Description: PGP signature
-- lyx-devel mailing list lyx-devel@lists.lyx.org http://lists.lyx.org/mailman/listinfo/lyx-devel
