inconsistencies between poky and yocto-docs trees

inconsistencies between poky and yocto-docs trees

[Nicolas Dechesne]

[-- Attachment #1: Type: text/plain, Size: 877 bytes --]

hi,

i just noticed that some documentation commits have made it to poky tree,
but they are not in yocto-docs tree.

The last 5 commits in yocto-docs:
$ git log --oneline -5
77e8a9e03 dev-manual: remove postinst false statement
dda137617 ref-manual: add migration section for 3.1
bc0923354 dev-manual: basic updates for npm fetcher changes
af9bf61a5 ref-manual: update PACKAGECONFIG glossary entry
d40485a7e overview-manual: fix obvious typo "ORHNAME"

The last 5 'doc' commits in yocto:
$ git log -5 --oneline  -- documentation/
f9e1127643 Updated patch for publishing
cd25abf777 Added usrmerge to distro-features for Bug 13494
fe25ef9871 ref-manual: correct "script" dirname to "scripts"
a44b8d2856 dev-manual: remove postinst false statement
c31ddaba1f ref-manual: add migration section for 3.1

The top 3 patches are missing in yocto-docs..

cheers

[-- Attachment #2: Type: text/html, Size: 1109 bytes --]

Re: [docs] inconsistencies between poky and yocto-docs trees

[Mark Morton]

[-- Attachment #1: Type: text/plain, Size: 1302 bytes --]

The following two are mine:

f9e1127643 Updated patch for publishing
cd25abf777 Added usrmerge to distro-features for Bug 13494

The question is, what happened?

Thanks,
-Mark M.

From: docs@lists.yoctoproject.org <docs@lists.yoctoproject.org> On Behalf Of Nicolas Dechesne
Sent: Tuesday, April 28, 2020 1:47 PM
To: docs@lists.yoctoproject.org
Subject: [docs] inconsistencies between poky and yocto-docs trees

hi,

i just noticed that some documentation commits have made it to poky tree, but they are not in yocto-docs tree.

The last 5 commits in yocto-docs:
$ git log --oneline -5
77e8a9e03 dev-manual: remove postinst false statement
dda137617 ref-manual: add migration section for 3.1
bc0923354 dev-manual: basic updates for npm fetcher changes
af9bf61a5 ref-manual: update PACKAGECONFIG glossary entry
d40485a7e overview-manual: fix obvious typo "ORHNAME"

The last 5 'doc' commits in yocto:
$ git log -5 --oneline  -- documentation/
f9e1127643 Updated patch for publishing
cd25abf777 Added usrmerge to distro-features for Bug 13494
fe25ef9871 ref-manual: correct "script" dirname to "scripts"
a44b8d2856 dev-manual: remove postinst false statement
c31ddaba1f ref-manual: add migration section for 3.1

The top 3 patches are missing in yocto-docs..

cheers

[-- Attachment #2: Type: text/html, Size: 5460 bytes --]

Re: [docs] inconsistencies between poky and yocto-docs trees

[Richard Purdie]

On Tue, 2020-04-28 at 22:47 +0200, Nicolas Dechesne wrote:
> hi,
> 
> i just noticed that some documentation commits have made it to poky
> tree, but they are not in yocto-docs tree. 
> 
> The last 5 commits in yocto-docs:
> $ git log --oneline -5
> 77e8a9e03 dev-manual: remove postinst false statement
> dda137617 ref-manual: add migration section for 3.1
> bc0923354 dev-manual: basic updates for npm fetcher changes
> af9bf61a5 ref-manual: update PACKAGECONFIG glossary entry
> d40485a7e overview-manual: fix obvious typo "ORHNAME"
> 
> The last 5 'doc' commits in yocto:
> $ git log -5 --oneline  -- documentation/
> f9e1127643 Updated patch for publishing
> cd25abf777 Added usrmerge to distro-features for Bug 13494
> fe25ef9871 ref-manual: correct "script" dirname to "scripts"
> a44b8d2856 dev-manual: remove postinst false statement
> c31ddaba1f ref-manual: add migration section for 3.1
> 
> The top 3 patches are missing in yocto-docs.. 

I think I'd missed a "push", my workflow is special cased around the
way Scott handled things. I've just manually done it and will beat my
scripts up a bit more...

Cheers,

Richard

Re: [docs] inconsistencies between poky and yocto-docs trees

[Nicolas Dechesne]

[-- Attachment #1: Type: text/plain, Size: 1359 bytes --]

On Tue, Apr 28, 2020 at 10:55 PM Richard Purdie <
richard.purdie@linuxfoundation.org> wrote:

> On Tue, 2020-04-28 at 22:47 +0200, Nicolas Dechesne wrote:
> > hi,
> >
> > i just noticed that some documentation commits have made it to poky
> > tree, but they are not in yocto-docs tree.
> >
> > The last 5 commits in yocto-docs:
> > $ git log --oneline -5
> > 77e8a9e03 dev-manual: remove postinst false statement
> > dda137617 ref-manual: add migration section for 3.1
> > bc0923354 dev-manual: basic updates for npm fetcher changes
> > af9bf61a5 ref-manual: update PACKAGECONFIG glossary entry
> > d40485a7e overview-manual: fix obvious typo "ORHNAME"
> >
> > The last 5 'doc' commits in yocto:
> > $ git log -5 --oneline  -- documentation/
> > f9e1127643 Updated patch for publishing
> > cd25abf777 Added usrmerge to distro-features for Bug 13494
> > fe25ef9871 ref-manual: correct "script" dirname to "scripts"
> > a44b8d2856 dev-manual: remove postinst false statement
> > c31ddaba1f ref-manual: add migration section for 3.1
> >
> > The top 3 patches are missing in yocto-docs..
>
> I think I'd missed a "push", my workflow is special cased around the
> way Scott handled things. I've just manually done it and will beat my
> scripts up a bit more...
>

thanks, I can see them now!


> Cheers,
>
> Richard
>
> 
>

[-- Attachment #2: Type: text/html, Size: 2040 bytes --]