search

star-bnl / star-sw

Core software for STAR experiment
26 stars 63 forks source link

Star6 #94

Closed perevbnlgov closed 2 years ago

perevbnlgov commented 2 years ago

There is Star6 version of star-sw. Now it is compiled by Cons. Victor

plexoos commented 2 years ago

This PR looks almost identical to #59 except you are trying to merge perevbnlgov:Star6 into star-bnl:Star6

I think what you intended to do was merging star-bnl:Star6 into star-bnl:main

perevbnlgov commented 2 years ago

I think you intended to do was merging star-bnl:Star6 into star-bnl:main No, I update branch StaR6. It is to early to update the main branch Victor

On 2021-08-10 20:29, Dmitri Smirnov wrote:

This is PR looks almost identical to #59 [1] except you are trying to merge perevbnlgov:Star6 into star-bnl:Star6

I think you intended to do was merging star-bnl:Star6 into star-bnl:main

-- You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub [2], or unsubscribe [3]. Triage notifications on the go with GitHub Mobile for iOS [4] or Android [5].

Links:

[1] https://github.com/star-bnl/star-sw/pull/59 [2] https://github.com/star-bnl/star-sw/pull/94#issuecomment-896403424 [3] https://github.com/notifications/unsubscribe-auth/ANQUL7MKQ7EXWI67C2JCCQTT4G75NANCNFSM5B44D4XQ [4] https://urldefense.com/v3/__https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675__;!!P4SdNyxKAPE!TyQhmfHCH0ogTjZ4HCDDvPeM8VthuikREhGzKP3_5M__ZmhTJB3nfU1mqIXppA$ [5] https://urldefense.com/v3/__https://play.google.com/store/apps/details?id=com.github.android&utm_campaign=notification-email__;!!P4SdNyxKAPE!TyQhmfHCH0ogTjZ4HCDDvPeM8VthuikREhGzKP3_5M__ZmhTJB3nfU2Qi1GHJg$

plexoos commented 2 years ago

No, I update branch Star6.

In this case, some of the previous comments and suggestions we discussed in #59 and during the meetings weeks ago still remain unaddressed. For example, why do you still propose to bring StRoot/StarGenerator/Pythia8_1_62 into this repository while this package is already in https://github.com/star-bnl/star-mcgen? How is it related to our ability to use ROOT6 in star-sw? For your information:

perevbnlgov commented 2 years ago

unaddressed. For example, why do you still propose to bring StRoot/StarGenerator/Pythia8_1_62 into this repository while this Well, I looked in my repository : DECAY EVENT Kinematics StarGenEventReader STEP UTIL BASE EMBED FILT macros StarLight TEST

There is now Pythia, I looked in perevbnlgov/star-sw, THERE IS Pythia But because there is no Pythia in my local repository I think it is work of Git to remove it. Is it true? Victor

PS. To avoid such mess I was trying to clean up my origin(perevbnlgov/star-sw) but not your proposal, not few others ,which I found on the web, did not work

On 2021-08-10 22:51, Dmitri Smirnov wrote:

No, I update branch Star6.

In this case, some of the previous comments and suggestions we discussed in #59 [1] and during the meetings weeks ago still remain unaddressed. For example, why do you still propose to bring StRoot/StarGenerator/Pythia8_1_62 into this repository while this package is already in https://github.com/star-bnl/star-mcgen? How is it related to our ability to use ROOT6 in star-sw? For your information:

  • star-sw compiles just fine without any code in star-mcgen
  • Our current CI jobs already build almost entire star-sw against both ROOT5 and ROOT6
  • You should update your branches with the latest improvements in CI by either merging the main branch into your branches or rebasing your branches onto main

-- You are receiving this because you authored the thread. Reply to this email directly, view it on GitHub [2], or unsubscribe [3]. Triage notifications on the go with GitHub Mobile for iOS [4] or Android [5].

Links:

[1] https://github.com/star-bnl/star-sw/pull/59 [2] https://github.com/star-bnl/star-sw/pull/94#issuecomment-896458904 [3] https://github.com/notifications/unsubscribe-auth/ANQUL7NM7A45XYRRI3NEM6LT4HQT5ANCNFSM5B44D4XQ [4] https://urldefense.com/v3/__https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675__;!!P4SdNyxKAPE!Rsk8FihYw5X5KvWgyu3r-RoMYVsum3CSyKwHurxr7dRMb6wPjxPCufzlEv9QCA$ [5] https://urldefense.com/v3/__https://play.google.com/store/apps/details?id=com.github.android&utm_campaign=notification-email__;!!P4SdNyxKAPE!Rsk8FihYw5X5KvWgyu3r-RoMYVsum3CSyKwHurxr7dRMb6wPjxPCufxtZh3ylg$

veprbl commented 2 years ago

@perevbnlgov I have a suggestion on how you could clean up the mess. Starting with your Star6 branch you can do git reset --soft HEAD~2. The meaning of that is to remove the 2 commits that you have (at this point git log will should show an old version of the main branch that you've branched off, and git status will show contents of your two commits staged). Then you do git reset to unstage (at this point git status will show bunch of unstaged changes). You can then run git add -p that would allow you to hand pick changes to stage. This will iterate through files that were already in the main branch, if you need to stage a new file, use git add path/to/individual/file.cxx. Once you've satisfied you can check what changes have been staged for commit by running git diff --staged and what changes will be left out of it by doing git diff and git status. You can then call git commit and only the changes that you've staged would make it into a commit (run git show to confirm that). Repeat git add -p/git commit until you create reasonable set of commits.

Overall you should never use git add --all/git add ., that is like flying blind.

perevbnlgov commented 2 years ago

On 2021-08-11 12:02, Dmitry Kalinkin wrote:

Hi Dmitry, thank you for suggestion. As I understand, you cleanup the local repository and then add modifications. But I already did in bu different way. I clone the official repository in Github (star-bnl/star-sw) into local repository. This repository is clean from any my additions, and then push it into my forked repository in GitHub. Is it the same? About my clean up. I tried to cleanup my forked with no success. I tried few different approaches from the web. Victor

@perevbnlgov [1] I have a suggestion on how you could clean up the mess. Starting with your Star6 branch you can do git reset --soft HEAD~2. The meaning of that is to remove the 2 commits that you have (at this point git log will should show an old version of the main branch that you've branched off, and git status will show contents of your two commits staged). Then you do git reset to unstage (at this point git status will show bunch of unstaged changes). You can then run git add -p that would allow you to hand pick changes to stage. This will iterate through files that were already in the main branch, if you need to stage a new file, use git add path/to/individual/file.cxx. Once you've satisfied you can check what changes have been staged for commit by running git diff --staged and what changes will be left out of it by doing git diff and git status. You can then call git commit and only the changes that you've staged would make it into a commit (run git show to confirm that). Repeat git add -p/git commit until you create reasonable set of commits.

Overall you should never use git add --all/git add ., that is like flying blind.

-- You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub [2], or unsubscribe [3]. Triage notifications on the go with GitHub Mobile for iOS [4] or Android [5].

Links:

[1] https://github.com/perevbnlgov [2] https://github.com/star-bnl/star-sw/pull/94#issuecomment-896951355 [3] https://github.com/notifications/unsubscribe-auth/ANQUL7NFTR4SP4UUE2YCTOLT4KNIVANCNFSM5B44D4XQ [4] https://urldefense.com/v3/__https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675__;!!P4SdNyxKAPE!XvKijBg-8_vUkP0X17gG7h0Z90pp2jQTAJhUGC-zlDDv8-Ff1l5I80_wTgafxw$ [5] https://urldefense.com/v3/__https://play.google.com/store/apps/details?id=com.github.android&utm_campaign=notification-email__;!!P4SdNyxKAPE!XvKijBg-8_vUkP0X17gG7h0Z90pp2jQTAJhUGC-zlDDv8-Ff1l5I809R9txX6g$

veprbl commented 2 years ago

As I understand, you cleanup the local repository and then add modifications.

Yes. The suggestion is to give up on the existing commits and redo them from scratch with the help of git.

But I already did in bu different way. I clone the official repository in Github (star-bnl/star-sw) into local repository. This repository is clean from any my additions, and then push it into my forked repository in GitHub. Is it the same?

This does not hurt, but doesn't help in this case.

plexoos commented 2 years ago

Hi Victor, a couple questions for you:

perevbnlgov commented 2 years ago

Hi guys. the problem is the following: I have made a STAR6 commit. But the viewers told that Pythia must be in star-mctools and some other comments. So I create new commit to account these opinions. As a result I have two commits. In CVS two consquent commits will do the job. In Git it is more complicated. I tried to remove my first commit. I tried to clean up my fork, but without success. I tried several proposed in the WEB attempts, all failed. If somebody explained me how to remove my first Root6 commit, I will be happy.

  • Can you look at this specific ROOT6 issue in OnlTools #102 (comment) [1]? I never tried to work with OnlTools. It was not a part of STARDEV. If it is needed I cand do it.

  • Can we close #59 [2]? If you mean to remove my first commit, do it please. As I told I do not know how to do it.

Victor

On 2021-08-13 12:22, Dmitri Smirnov wrote:

Hi Victor, a couple questions for you:

  • Have you managed to separate a smaller ROOT6 related change to a new branch so we can review it in a separate pull request?
  • Can you look at this specific ROOT6 issue in OnlTools #102 (comment) [1]?
  • Can we close #59 [2]?

-- You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub [3], or unsubscribe [4]. Triage notifications on the go with GitHub Mobile for iOS [5] or Android [6].

Links:

[1] https://github.com/star-bnl/star-sw/issues/102#issue-970523289 [2] https://github.com/star-bnl/star-sw/pull/59 [3] https://github.com/star-bnl/star-sw/pull/94#issuecomment-898577470 [4] https://github.com/notifications/unsubscribe-auth/ANQUL7O7ZRRL3STND5MH5I3T4VBDXANCNFSM5B44D4XQ [5] https://urldefense.com/v3/__https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675__;!!P4SdNyxKAPE!X1wdG53AGWDsxSj7lKFHeoupC4HYSRkzaqSQ_9kD7GC1G38rfRdynfEMjxQGNw$ [6] https://urldefense.com/v3/__https://play.google.com/store/apps/details?id=com.github.android&utm_campaign=notification-email__;!!P4SdNyxKAPE!X1wdG53AGWDsxSj7lKFHeoupC4HYSRkzaqSQ_9kD7GC1G38rfRdynfFX-SdC5Q$

plexoos commented 2 years ago

Victor, OnlTools is part of our repository now and it should compile as any other package in star-sw. The issue I am referring to is related to ROOT6 so you don't need to know the details about OnlTools.

As an exercise, can you please do the following exactly as typed line by line, in order to fix this problem https://github.com/star-bnl/star-sw/issues/102#issue-970523289?

mkdir -p newdir
cd newdir
git clone git@github.com:star-bnl/star-sw.git
cd star-sw
git checkout -b pr/fix_onltools_root6 origin/pr/ci_build_onltools
# Open your favorite editor and
# modify the code to fix the issue with the private constructor
git add -p .
git status # optional
git commit -m "Fix issue with private copy constructor in ROOT6"
git push -u origin pr/fix_onltools_root6

Now go to https://github.com/star-bnl/star-sw/compare/pr/ci_build_onltools...pr/fix_onltools_root6 and click the "Create pull request" button. That's it.

veprbl commented 2 years ago

If somebody explained me how to remove my first Root6 commit, I will be happy.

That's easy:

git rebase -i `git merge-base origin/main HEAD`

Then remove the line corresponding to the unfavored commit. There will be also other interesting options that you will see.

If you break something, you can always see git reflog and use git reset --hard to restore the branch to it's previous state.

perevbnlgov commented 2 years ago

Hi Dmitri, thank you. ut what I got: git rebase -i git merge-base origin/main HEAD

fatal: not a git repository (or any parent up to mount point /) Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set). fatal: not a git repository (or any parent up to mount point /) Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).

Victor

On 2021-08-13 14:35, Dmitry Kalinkin wrote:

If somebody explained me how to remove my first Root6 commit, I will be happy.

That's easy:

git rebase -i git merge-base origin/main HEAD

Then remove the line corresponding to the unfavored commit. There will be also other interesting options that you will see. If you break something, you can always see git reflog and use git reset --hard to restore the branch to it's previous state.

-- You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub [1], or unsubscribe [2]. Triage notifications on the go with GitHub Mobile for iOS [3] or Android [4].

Links:

[1] https://github.com/star-bnl/star-sw/pull/94#issuecomment-898648399 [2] https://github.com/notifications/unsubscribe-auth/ANQUL7LCEBSITM4BGNF4OYDT4VQVZANCNFSM5B44D4XQ [3] https://urldefense.com/v3/__https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675__;!!P4SdNyxKAPE!SjuKaF_iaDCn5jsos4WOIiyG2QUiVWgR8Lt64SdDoj0UUUr0mWXU7LlOQFOVzw$ [4] https://urldefense.com/v3/__https://play.google.com/store/apps/details?id=com.github.android&utm_campaign=notification-email__;!!P4SdNyxKAPE!SjuKaF_iaDCn5jsos4WOIiyG2QUiVWgR8Lt64SdDoj0UUUr0mWXU7LnDzJdF4A$

plexoos commented 2 years ago

fatal: not a git repository

You need to be inside the directory with cloned repo when you issue git commands:

cd star-sw/ # or whatever the name is where you cloned
ls -a .git # then make sure the `.git` directory exists in star-sw/
perevbnlgov commented 2 years ago

You need to be inside the directory with cloned repo when you issue git commands: Yes, I am sitting in Git directory and I have .git directory . docker .git .gitignore mgr pams StarVMC StRoot .. asps .dockerignore .github kumacs OnlTools StarDb StDb

On 2021-08-13 16:35, Dmitri Smirnov wrote:

fatal: not a git repository

You need to be inside the directory with cloned repo when you issue git commands:

cd star-sw/ # or whatever the name is where you cloned ls -a .git # then make sure the .git directory exists in star-sw/

-- You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub [1], or unsubscribe [2]. Triage notifications on the go with GitHub Mobile for iOS [3] or Android [4].

Links:

[1] https://github.com/star-bnl/star-sw/pull/94#issuecomment-898706845 [2] https://github.com/notifications/unsubscribe-auth/ANQUL7NUURIBT5ZNRGGZWH3T4V6XJANCNFSM5B44D4XQ [3] https://urldefense.com/v3/__https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675__;!!P4SdNyxKAPE!R_pERaS_XneQaI1CaWqGKyDmwtH5r7ymkotpFk87MEcfKCtToJ8pwReoUcmJlA$ [4] https://urldefense.com/v3/__https://play.google.com/store/apps/details?id=com.github.android&utm_campaign=notification-email__;!!P4SdNyxKAPE!R_pERaS_XneQaI1CaWqGKyDmwtH5r7ymkotpFk87MEcfKCtToJ8pwRegDWAcrg$

veprbl commented 2 years ago 
fatal: not a git repository (or any parent up to mount point /)
Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).

Do any other git commands work?

perevbnlgov commented 2 years ago

Do any other git commands work? Yes For instance I clone from forked.

On 2021-08-13 17:34, Dmitry Kalinkin wrote:

fatal: not a git repository (or any parent up to mount point /) Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).

Do any other git commands work?

-- You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub [1], or unsubscribe [2]. Triage notifications on the go with GitHub Mobile for iOS [3] or Android [4].

Links:

[1] https://github.com/star-bnl/star-sw/pull/94#issuecomment-898731469 [2] https://github.com/notifications/unsubscribe-auth/ANQUL7MTNASAMMVT2XLW3A3T4WFWLANCNFSM5B44D4XQ [3] https://urldefense.com/v3/__https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675__;!!P4SdNyxKAPE!UDhDYlW1d9R0vQqxj6Wq79hBltfzf_A_U0dy6cq6hFWUgubvOkUtr7CfHNkxyg$ [4] https://urldefense.com/v3/__https://play.google.com/store/apps/details?id=com.github.android&utm_campaign=notification-email__;!!P4SdNyxKAPE!UDhDYlW1d9R0vQqxj6Wq79hBltfzf_A_U0dy6cq6hFWUgubvOkUtr7AyqInYMw$

veprbl commented 2 years ago

Do any other git commands work? Yes For instance I clone from forked. …

I meant commands that work with repository: git log, git status If those work, git rebase should work as well

perevbnlgov commented 2 years ago

Yes, you right. The other commands was not working as well. I deleted everything make a clone again and then run your command. Not it was working, printed that clean is made, then print some errors. I will check more carefully tomorrow. Thank you very much, Victor

On 2021-08-13 21:44, Dmitry Kalinkin wrote:

Do any other git commands work? Yes For instance I clone from forked. …

I meant commands that work with repository: git log, git status If those work, git rebase should work as well

-- You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub [1], or unsubscribe [2]. Triage notifications on the go with GitHub Mobile for iOS [3] or Android [4].

Links:

[1] https://github.com/star-bnl/star-sw/pull/94#issuecomment-898791348 [2] https://github.com/notifications/unsubscribe-auth/ANQUL7N37WQYX2RSZ6VCOTLT4XDBFANCNFSM5B44D4XQ [3] https://urldefense.com/v3/__https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675__;!!P4SdNyxKAPE!Sxlf4TE9i4jGQog28hwbGQas49oDlOSL9hSk2P9oPa1Enez0sligN0o75HxALQ$ [4] https://urldefense.com/v3/__https://play.google.com/store/apps/details?id=com.github.android&utm_campaign=notification-email__;!!P4SdNyxKAPE!Sxlf4TE9i4jGQog28hwbGQas49oDlOSL9hSk2P9oPa1Enez0sligN0o0-Nh1lQ$

plexoos commented 2 years ago

I deleted everything make a clone again

That is exactly what I suggested in https://github.com/star-bnl/star-sw/pull/94#issuecomment-898647717 Now, just create a new branch, commit changes, and share it with us by pushing it here. Branches do not cost anything in Git. You don't want to grow the same branch for months without merging as in CVS.

perevbnlgov commented 2 years ago

Hi Dmitri, I did: git rebase -i git merge-base origin/main HEAD After that my local repository became == star-bnl/star-sw as what I want, but "forked" is still the same Victor

On 2021-08-13 17:34, Dmitry Kalinkin wrote:

fatal: not a git repository (or any parent up to mount point /) Stopping at filesystem boundary (GIT_DISCOVERY_ACROSS_FILESYSTEM not set).

Do any other git commands work?

-- You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub [1], or unsubscribe [2]. Triage notifications on the go with GitHub Mobile for iOS [3] or Android [4].

Links:

[1] https://github.com/star-bnl/star-sw/pull/94#issuecomment-898731469 [2] https://github.com/notifications/unsubscribe-auth/ANQUL7MTNASAMMVT2XLW3A3T4WFWLANCNFSM5B44D4XQ [3] https://urldefense.com/v3/__https://apps.apple.com/app/apple-store/id1477376905?ct=notification-email&mt=8&pt=524675__;!!P4SdNyxKAPE!UDhDYlW1d9R0vQqxj6Wq79hBltfzf_A_U0dy6cq6hFWUgubvOkUtr7CfHNkxyg$ [4] https://urldefense.com/v3/__https://play.google.com/store/apps/details?id=com.github.android&utm_campaign=notification-email__;!!P4SdNyxKAPE!UDhDYlW1d9R0vQqxj6Wq79hBltfzf_A_U0dy6cq6hFWUgubvOkUtr7AyqInYMw$

veprbl commented 2 years ago

but "forked" is still the same

The remote repositories are left unchanged unless you do the git push

plexoos commented 2 years ago

Hi Victor, any luck creating a branch with something we can merge?