Necessary Maintenance #7009
Repair required to art repository.
On Friday morning, at around 11:14 CDT, an erroneous merge with the master branch was pushed to the development branch of the art repository on cdcvs.fnal.gov. While no code changes were carried with this commit, it has the effect of making the repository's history much harder to read and understand going forward, and for this reason we will be removing this commit from the central repository. If you have a local clone of the repository via any method (e.g. http or ssh), please for each clone:
- Make a tarfile backup with (e.g.):
( cd .. ; tar jcf <tarfile> <lcoal-repo-name> )
- If you have not pulled or fetched origin/develop from cdcvs.fnal.gov, then please refrain from doing so until you have been given the all-clear. This is the only action required of you in this case.
- If you have, or you think you may have, any local branches with the bad merge in the tree (including develop), you may check with the following command:
git rev-list <branch> | grep 76047bbc39d714ac2f99d645ac420ef0c914f63d
- For each branch for which the previous command returns success (i.e. has the offending merge):
- Commit any local changes you wish to preserve. This includes anything you currently have stashed, since the stash will also be no good after the repair has been made.
- Then, execute the following command to preserve your changes:
git checkout <branch> git format-patch --stdout <first-good-sha1>..<last-good-sha1> > <branch>-rescue.txtNote the literal
..separating the two SHA1s.
gitkcan help you decide which commits you need to keep.
- Update the metadata for the
origin/developbranch in your local repository:
git fetch origin
- For each branch identified by step (2), when and only when you receive the all clear that the repair has been made:
git checkout master git branch -D <branch> git checkout -b <branch> origin/develop # If you have a saved patch: git am <branch>-rescue.txt
As of right now, there are no published feature branches which include the bad merge commit, so no-one should have to deal with that eventuality.