[Nut-upsdev] Merging the DDL branch in nut-website
hyouko at gmail.com
hyouko at gmail.com
Sun Aug 10 22:48:01 UTC 2014
> Is this the current layout?
>
> nut-website (branch: dll-hll)
> \__ nut submodule (branch: master)
> \__ ddl submodule (branch unknown?)
nut-website (branch: dll-hll)
\__ nut submodule (branch: master @ abc0006 [not updated to avoid
conflicts when merging back to master])
\__ ddl submodule (branch: master @ bbfd79f; now updated to ab6166c)
> The "ddl" branch might be unknown since I have the nut-website master branch checked out, and I wasn't sure whether to mess with that. I get the following "git status" in ddl: "HEAD detached at bbfd79f".
I didn't grab the last updates from nut-ddl-raw, so it was still at
bbfd79f (master, 12 may); now it's updated: checking out ddl's master
should suffice.
> I would like to merge the ddl-hll branch back into master (and add DDL to the main "networkupstools" project), if it's ready. Is there anything else needed?
I vaguely recall I wanted to move (in nut-ddl-raw/README.adoc) the
detailed descriptions of 'special' comments and RW vars/instant
commands declaration from the 'nds' section to the 'dev/seq' one and
then comment out the 'nds' section till we're ready with the
supporting software. Well, as I was there.. just did it.
Sorry for not being very supportive in the last months. Hopefully I'll
be back soon.
More information about the Nut-upsdev
mailing list