DocBook v2

Thibaut Cuvelier tcuvelier at lyx.org
Mon Aug 31 16:23:07 UTC 2020


On Mon, 31 Aug 2020 at 17:53, Kornel Benko <kornel at lyx.org> wrote:

> Am Mon, 31 Aug 2020 17:42:16 +0200
> schrieb Thibaut Cuvelier <tcuvelier at lyx.org>:
>
> > On Mon, 31 Aug 2020 at 17:17, Kornel Benko <kornel at lyx.org> wrote:
> >
> > > Am Mon, 31 Aug 2020 16:44:33 +0200
> > > schrieb Thibaut Cuvelier <tcuvelier at lyx.org>:
> > >
> > > > Locally, Git says everything's alright:
> > > >
> > > > Thibaut at MSI MINGW64 /d/LyX/lyx-unstable (feature/docbook)
> > > > $ git push --force
> > > > Enumerating objects: 2774, done.
> > > > Counting objects: 100% (2774/2774), done.
> > > > Delta compression using up to 12 threads
> > > > Compressing objects: 100% (1572/1572), done.
> > > > Writing objects: 100% (2274/2274), 2.62 MiB | 1.74 MiB/s, done.
> > > > Total 2274 (delta 1908), reused 728 (delta 702), pack-reused 0
> > > > remote: postdrop: warning: uid=1005: File too large
> > > > remote: sendmail: fatal: tcuvelier at lyx.org(1005): message file too
> big
> > > > To git.lyx.org:features.git
> > > >  + f46fb80512...d268809f2e feature/docbook -> feature/docbook (forced
> > > update)
> > > >
> > > > Thibaut at MSI MINGW64 /d/LyX/lyx-unstable (feature/docbook)
> > > > $ git push --force
> > > > Everything up-to-date
> > > >
> > > > I did not touch master for now, I prefer to have some feedback and a
> > > more formal OK
> > > > before doing so.
> > > >
> > >
> > > The problem I see is that the log in your branch does not show
> > > any commits (from other devs than you) newer than Aug. 3.
> > > commit 8415041b
> > > Author:     Juergen Spitzmueller <spitz at lyx.org>
> > > AuthorDate: Mon Aug 3 14:10:46 2020 +0200
> > > Commit:     Juergen Spitzmueller <spitz at lyx.org>
> > > CommitDate: Mon Aug 3 14:10:46 2020 +0200
> > >
> > > But in master there are 213 newer commits which are not in the log of
> > > features/docbook.
> > >
> >
> > Better this way? It looks like I did not fetch all commits previously…
> Here
> > is the last non-DocBook commit:
> >
> > commit 3c25899eab265aa8d5ca6af48b669650dff34298 (official/master, master)
> > Author: Richard Kimberly Heck <rikiheck at lyx.org>
> > Date:   Mon Aug 31 11:20:49 2020 -0400
> >
> >     Improved fix for edit button
>
> Looks got (at your side)
>
>
> Here it shows:
>  $ git branch
> * features/docbook
>   master
>   xml
>
>  $ git pull
> Already up to date.
>  $ git log | head -20
> commit 8b5abcce1c633be06d66413e95b22896523a9194
> Author: Thibaut Cuvelier <tcuvelier at lyx.org>
> Date:   Mon Aug 3 16:04:26 2020 +0200
>
>     DocBook: add a layout tag to tell whether an item is the abstract or
> not.
>
> commit d3b54de70ea1ab5f9431cfd3b9aa126d8b1f991e
> Author: Thibaut Cuvelier <tcuvelier at lyx.org>
> Date:   Sun Aug 2 20:43:39 2020 +0200
>
>     DocBook: simplify code to handle abstracts.
>
> commit 024e8657ec0720a9b5f64e4e96a9ac5468fd4e66
> Author: Thibaut Cuvelier <tcuvelier at lyx.org>
> Date:   Sun Aug 2 19:00:07 2020 +0200
>
>     DocBook: eat a bit of that spaghetti code.
>
> commit 836dabca4c6530c62af9f5599e3e93c115e368df
> Author: Thibaut Cuvelier <tcuvelier at lyx.org>
>

I finally got it to display Riki's last commit from today in features:
https://www.lyx.org/trac/log/features. It looks like I had leftovers of
previous remotes somewhere… Is this good for you?
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.lyx.org/pipermail/lyx-devel/attachments/20200831/d2f3ca06/attachment-0001.html>


More information about the lyx-devel mailing list