Re: [Cppqed-support] new repository layout, Development branch ready

[Raimar S. <rai...@ui...>]

Dear András,

I have merged the new repository layout into Development. This was certainly one of the more interesting merges I have had so far :)

The branches are currently named:

C++QED -> Development
C++QEDcore -> Development_split_elements
CPPQEDelements -> Development
C++QEDscripts -> Development_split_elements

I think after some testing we can merge the Development_split_elements branches back into Development (this will be a fast-forward), thus concluding the split. Then new doxygen-branches can be created as well. For the OpenMP branch it might be an option to rebase and push --force (will be a simpler history graph), or otherwise merge. This should be straight forward, as the changes in OpenMP touch only the core.

I had to disable some scripts, could you check if this was to be expected (I think so) or if the failures result from the merge? To re-enable for testing, remove the scripts from the EXCLUDE_SCRIPTS variable in CMakeLists.txt.

Best regards
Raimar

P.S.: Some technical details...

Are you currently working with the C++QED repository and submodules or with the standalone repositories? If you have standalone repositories, just checkout the corresponding branches, you can ignore the rest.

If you are using C++QED, checkout Development in C++QED. This will not touch the submodules, therefore you will have a dirty working directory because the recorded commits of the submodules don't match. You have to switch branches in the submodules manually, or to automate this, call inside C++QED:

$ git submodule foreach 'BRANCH=$(git config --file $toplevel/.gitmodules --get submodule.${name}.branch); git checkout ${BRANCH:-master}

This command is so useful that I have created an alias in ~/.gitconfig:

[alias]
        attach = "submodule foreach 'BRANCH=$(git config --file $toplevel/.gitmodules --get submodule.${name}.branch); git checkout ${BRANCH:-master}'"

With this alias in place, the work flow for cloning and switching branches would be:

git clone --recurse <URL_of_C++QED> C++QED
cd C++QED
git attach

Change to Development branch:

git checkout Development
git attach

Change back to master:

git checkout master
git attach