Since something went wrong in a recent commit, I want to write a short note on the nant generateGlue for everyone.
At the moment, when you run generateGlue after adding a new namespace to the file csharp\ICT\Petra\Definitions\NamespaceHierarchy.yml, generateGlue will most probably not be able to cope with the conflicts.
There will be an exception, telling you to manually merge the files e.g. csharp\ICT\Petra\Server\lib\MSysMan\Instantiator.AutoHierarchy.cs and csharp\ICT\Petra\Server\lib\MSysMan\Instantiator.AutoHierarchy.cs.new
You have to move the new changes from the .new file to the original file, and run nant generateGlue again.
Please be very careful when merging the files!
There is currently an issue that ManualCode gets inserted too often in the .new file.
At least when committing, please make sure that ManualCode is not inserted in places that you have not changed.
You also might notice that there is suddenly a comment with three slashes in the middle of the code. Do not merge that into the .cs file.
I have fixed this in the last commit for csharp\ICT\Petra\Server\lib\MSysMan\Instantiator.AutoHierarchy.cs
openpetraorg.git.sourceforge.net ... c97f7da1a1
