-
Notifications
You must be signed in to change notification settings - Fork 63
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Star6 #94
Star6 #94
Conversation
This PR looks almost identical to #59 except you are trying to merge I think what you intended to do was merging |
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] #59
[2] #94 (comment)
[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$
|
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?
|
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] #59
[2] #94 (comment)
[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$
|
@perevbnlgov Overall you should never use |
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] #94 (comment)
[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$
|
Yes. The suggestion is to give up on the existing commits and redo them from scratch with the help of git.
This does not hurt, but doesn't help in this case. |
Hi Victor, a couple questions for you:
|
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] #102 (comment)
[2] #59
[3] #94 (comment)
[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$
|
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 #102 (comment)?
Now go to pr/ci_build_onltools...pr/fix_onltools_root6 and click the "Create pull request" button. That's it. |
That's easy:
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 |
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] #94 (comment)
[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$
|
You need to be inside the directory with cloned repo when you issue git commands:
|
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] #94 (comment)
[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$
|
Do any other git commands work? |
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] #94 (comment)
[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$
|
I meant commands that work with repository: |
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] #94 (comment)
[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$
|
That is exactly what I suggested in #94 (comment) |
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] #94 (comment)
[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$
|
The remote repositories are left unchanged unless you do the |
Hi Victor, any luck creating a branch with something we can merge? |
mgr/ROOT_LEVEL
Outdated
@@ -1 +1,2 @@ | |||
5.34.38 | |||
6.99.99 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
THis file should NOT be committed. Our root level is 5.34.38
mgr/gccfilter
Outdated
@@ -0,0 +1,451 @@ | |||
#!/usr/bin/env perl |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
gccfilter should not be a requirement for ROOT6. It might be nice to have, but... definitely falls under the category of "tools" not "build system". Should be located elsewhere.
There is Star6 version of star-sw. Now it is compiled by Cons.
Victor