Attention is currently required from: laforge, osmith, pespin.

Hello Jenkins Builder, laforge, osmith,

I'd like you to reexamine a change. Please visit

https://gerrit.osmocom.org/c/libosmocore/+/40296?usp=email

to look at the new patch set (#5).

The following approvals got outdated and were removed: Code-Review+1 by laforge, Code-Review+1 by osmith, Verified+1 by Jenkins Builder

Change subject: osmo-config-merge: Fix comments with different indentation creating merge problems ......................................................................

osmo-config-merge: Fix comments with different indentation creating merge problems

VTY comments are not part of the tree structure, since they can be placed anywhere and are just ignored. Hence, ignore them when generating the tree structure during file read.

This has the backside that of course when merging files, comments on the 0-level show up in the end in testB.ok since the content below it in testB.confmerge is now merged (properly) into previous nodes. This can be slightly improved by placing the comments in the proper indentation level, since if a new node is appended from the .confmerge, they will be added in order and hence will show up properly.

Change-Id: I7de78d3ed3ca27e3470ea66a78ff9c5acfe65741 --- M tests/osmo-config-merge/testA.ok M tests/osmo-config-merge/testB.ok M tests/osmo-config-merge/testB2.ok M utils/osmo-config-merge.c 4 files changed, 156 insertions(+), 128 deletions(-)

git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/96/40296/5