search

Mu2e / Mu2eEventDisplay

REve based event display developed by the Analysis Tools Group
Apache License 2.0
0 stars 12 forks source link

Fix the failed revert. #169

Closed kutschke closed 3 months ago

kutschke commented 3 months ago

Before we merge, read this including the suggestion for homework at the end.

I started from the HEAD at 129ad55f, merge of PR 167 and revert 5 commits, including two merge commits, to get back to the head after the merge of PR 165 (SHA 5c530a99) . The commands were

git revert -m 2 129ad55fb56012ef6cc63ac267721f5c3297b305
git revert      21372f90975d187462190eb3b3b06eb4f3c4a5dd
git revert -m 2 2ac3d7a07bdd51db6d40b516c4e73e016246f152
git revert      969b751fc12837eabb4e8558abc1cbd72a083ed9
git revert      b575741faf97d6bdf3af2f4d3c3b7ee5c84cb7c4

Following this I did: git diff 5c530a99

Which gave an exact match.

I did a trial merge which I think did the right thing but I am not 100% sure.

Suggestion for Dave;

  1. clone the head of Mu2e/REve
  2. merge in this PR
  3. merge in your PR
  4. Let us know if it is correct.

If all goes we merge this and you reopen your PR (or make a new one).

kutschke commented 3 months ago

On my first attempt I put the -m 2 after the SHA, not before. I tried it both ways and it gives the same result.