Converting sim-recon tags and branches to the split repositories

From GlueXWiki
Revision as of 13:24, 31 July 2018 by Marki (Talk | contribs) (Created page with "First recall that the new halld_recon and halld_sim repositories are complete clones of the old sim-recon repository. That means they both contain all of the history of sim-re...")

(diff) ← Older revision | Latest revision (diff) | Newer revision → (diff)
Jump to: navigation, search

First recall that the new halld_recon and halld_sim repositories are complete clones of the old sim-recon repository. That means they both contain all of the history of sim-recon as well as all of its tags and branches. The fact that not all of the old directories appear is that they have been deleted in a git-like manner. Those directories are still present in the history of each of the new repositories. The src/SBMS directory is the only directory contained in both. It had been modified in a new-repository-specifice way for each new repository.

When you checkout your old sim-recon branch from a halld_recon or halld_sim repository, you will get the entire tree in its old sim-recon form. In particular you will get all of the code for both the sim stuff and tne recon stuff, and an SBMS directory that is meant to build both. That is after all, the last thing you pushed to the sim-recon repository. In the majority of cases, this is not a problem. You can do the sim-recon-style build even though the "origin" repository is halld_recon or halld_sim, test the resulting binaries, push your changes to halld_recon or halld_sim as appropriate, and submit your pull request as before. The subsequent merge will use the new repository-appropriate SBMS directory, delete the directories that are now in the "other" repository and update the master with your changes.

Another scenario is that you want to maintain your changes on your branch, but want to transform the branch to have the new repository-specific build procedure and directories. In that case, you can merge the master onto your branch. That merge will delete the directories now in the "other" repository and update your SBMS directory to do the new right thing.

Unless there are conflicts.

...