Closed evanberkowitz closed 8 years ago
Fixed with commit 76882e9426a18b56a0f48acb651ab03000fafc43
Is there any possibility of changing git@bitbucket.org:JeffersonLab
to https://github.com/JeffersonLab
in the .gitmodules
file? If not, how do I stop my attempts at recursive cloning from failing?
Hi Dean, I thought I changed this to be protocol agnostic. But maybe only in 'devel'. Which branch are you trying to use. (I recommend 'devel' - for the entire stack...)
Best, B
Sent from Bluehttp://www.bluemail.me/r?b=14874 On May 15, 2019, at 3:21 PM, Dean Howarth notifications@github.com<mailto:notifications@github.com> wrote:
Is there any possibility of changing git@bitbucket.org:JeffersonLab to https://github.com/JeffersonLab in the .gitmodules file? If not, how do I stop my attempts at recursive cloning from failing?
— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHubhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_chroma_issues_12-3Femail-5Fsource-3Dnotifications-26email-5Ftoken-3DAAEPL2ALWBBL5KXNIBVLVETPVRPCRA5CNFSM4CIKYGQ2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODVPV3ZY-23issuecomment-2D492789223&d=DwMCaQ&c=CJqEzB1piLOyyvZjb8YUQw&r=WG01dcOd8ZFLFFNkrpbj6A&m=7IZfSQsV5W4ThNEtYL12fRrRmOegueh4XM8k_AfuK6o&s=Gl190bAjd7-LazvEM9xyC41NMh8My6k3I0FJjqy6HrA&e=, or mute the threadhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_notifications_unsubscribe-2Dauth_AAEPL2BKM2WJ5RG2YWZ24STPVRPCRANCNFSM4CIKYGQQ&d=DwMCaQ&c=CJqEzB1piLOyyvZjb8YUQw&r=WG01dcOd8ZFLFFNkrpbj6A&m=7IZfSQsV5W4ThNEtYL12fRrRmOegueh4XM8k_AfuK6o&s=fO0J-lSWPFcjUEdmOOCbNkn1WvmLtsJR53QQ3-B9qd4&e=.
Ahh, great, thank you Balint. I was actually using a custom Chroma that was forked from master, and when I checked master it was still using ssh. I see that your devel branch is the same as QIO and LIME in that it is protocol agnostic, so we can just change the custom branch similarly.
Hi Balint, What’s stopping us from merging qdp++/chroma devel branches back onto master? This is a bit silly...
Robert
On May 15, 2019, at 4:00 PM, Balint Joo notifications@github.com<mailto:notifications@github.com> wrote:
Hi Dean, I thought I changed this to be protocol agnostic. But maybe only in 'devel'. Which branch are you trying to use. (I recommend 'devel' - for the entire stack...)
Best, B
Sent from Bluehttp://www.bluemail.me/r?b=14874 On May 15, 2019, at 3:21 PM, Dean Howarth notifications@github.com<mailto:notifications@github.commailto:notifications@github.com> wrote:
Is there any possibility of changing git@bitbucket.orgmailto:git@bitbucket.org:JeffersonLab to https://github.com/JeffersonLab in the .gitmodules file? If not, how do I stop my attempts at recursive cloning from failing?
— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHubhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_chroma_issues_12-3Femail-5Fsource-3Dnotifications-26email-5Ftoken-3DAAEPL2ALWBBL5KXNIBVLVETPVRPCRA5CNFSM4CIKYGQ2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODVPV3ZY-23issuecomment-2D492789223&d=DwMCaQ&c=CJqEzB1piLOyyvZjb8YUQw&r=WG01dcOd8ZFLFFNkrpbj6A&m=7IZfSQsV5W4ThNEtYL12fRrRmOegueh4XM8k_AfuK6o&s=Gl190bAjd7-LazvEM9xyC41NMh8My6k3I0FJjqy6HrA&e=, or mute the threadhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_notifications_unsubscribe-2Dauth_AAEPL2BKM2WJ5RG2YWZ24STPVRPCRANCNFSM4CIKYGQQ&d=DwMCaQ&c=CJqEzB1piLOyyvZjb8YUQw&r=WG01dcOd8ZFLFFNkrpbj6A&m=7IZfSQsV5W4ThNEtYL12fRrRmOegueh4XM8k_AfuK6o&s=fO0J-lSWPFcjUEdmOOCbNkn1WvmLtsJR53QQ3-B9qd4&e=.
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHubhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_chroma_issues_12-3Femail-5Fsource-3Dnotifications-26email-5Ftoken-3DAAJD3NHGELLCRX7Y7C4LX7TPVRTU5A5CNFSM4CIKYGQ2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODVPY53I-23issuecomment-2D492801773&d=DwMFaQ&c=CJqEzB1piLOyyvZjb8YUQw&r=x-VqZ7MQP0DYD9BF-N0nBw&m=CuA-KFSYsyiejFjWhzY9K81jCCSeBvoybe88FUJDRo0&s=_wqEpLdoRDX2rMgH93BtJLYj2JM1mMHNA_YFaYaHMpk&e=, or mute the threadhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_notifications_unsubscribe-2Dauth_AAJD3NAF7552SLLD7LQMBELPVRTU5ANCNFSM4CIKYGQQ&d=DwMFaQ&c=CJqEzB1piLOyyvZjb8YUQw&r=x-VqZ7MQP0DYD9BF-N0nBw&m=CuA-KFSYsyiejFjWhzY9K81jCCSeBvoybe88FUJDRo0&s=XswYVhXUblXuLUlka_74N7XSk3XIcdA_8pCXjGLhhOw&e=.
2 things
a) any changes that got made to master rather than devel that can cause a conflict by folks not following the GitFlow model and
b) some degree of human time would be involved testing the merged master. Especially case a) would cause issues e.g. if a feature was reworked in master by someone and that got overwritten during a merge, resulting in a code that may pass regression tests ( also overwritten by the merge) but the measurement now had a different behavior, which would be discovered later down the line This is primarily a question of (human) time for the stakeholders involved.
Best, B
Sent from Bluehttp://www.bluemail.me/r?b=14874 On May 15, 2019, at 11:22 PM, Robert Edwards notifications@github.com<mailto:notifications@github.com> wrote: Hi Balint, What’s stopping us from merging qdp++/chroma devel branches back onto master? This is a bit silly...
Robert
On May 15, 2019, at 4:00 PM, Balint Joo notifications@github.com<mailto:notifications@github.com> wrote:
Hi Dean, I thought I changed this to be protocol agnostic. But maybe only in 'devel'. Which branch are you trying to use. (I recommend 'devel' - for the entire stack...)
Best, B
Sent from Bluehttp://www.bluemail.me/r?b=14874 On May 15, 2019, at 3:21 PM, Dean Howarth notifications@github.com<mailto:notifications@github.commailto:notifications@github.com> wrote:
Is there any possibility of changing git@bitbucket.orgmailto:git@bitbucket.org:JeffersonLab to https://github.com/JeffersonLab in the .gitmodules file? If not, how do I stop my attempts at recursive cloning from failing?
— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHubhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_chroma_issues_12-3Femail-5Fsource-3Dnotifications-26email-5Ftoken-3DAAEPL2ALWBBL5KXNIBVLVETPVRPCRA5CNFSM4CIKYGQ2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODVPV3ZY-23issuecomment-2D492789223&d=DwMCaQ&c=CJqEzB1piLOyyvZjb8YUQw&r=WG01dcOd8ZFLFFNkrpbj6A&m=7IZfSQsV5W4ThNEtYL12fRrRmOegueh4XM8k_AfuK6o&s=Gl190bAjd7-LazvEM9xyC41NMh8My6k3I0FJjqy6HrA&e=, or mute the threadhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_notifications_unsubscribe-2Dauth_AAEPL2BKM2WJ5RG2YWZ24STPVRPCRANCNFSM4CIKYGQQ&d=DwMCaQ&c=CJqEzB1piLOyyvZjb8YUQw&r=WG01dcOd8ZFLFFNkrpbj6A&m=7IZfSQsV5W4ThNEtYL12fRrRmOegueh4XM8k_AfuK6o&s=fO0J-lSWPFcjUEdmOOCbNkn1WvmLtsJR53QQ3-B9qd4&e=.
— You are receiving this because you are subscribed to this thread. Reply to this email directly, view it on GitHubhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_chroma_issues_12-3Femail-5Fsource-3Dnotifications-26email-5Ftoken-3DAAJD3NHGELLCRX7Y7C4LX7TPVRTU5A5CNFSM4CIKYGQ2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODVPY53I-23issuecomment-2D492801773&d=DwMFaQ&c=CJqEzB1piLOyyvZjb8YUQw&r=x-VqZ7MQP0DYD9BF-N0nBw&m=CuA-KFSYsyiejFjWhzY9K81jCCSeBvoybe88FUJDRo0&s=_wqEpLdoRDX2rMgH93BtJLYj2JM1mMHNA_YFaYaHMpk&e=, or mute the threadhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_notifications_unsubscribe-2Dauth_AAJD3NAF7552SLLD7LQMBELPVRTU5ANCNFSM4CIKYGQQ&d=DwMFaQ&c=CJqEzB1piLOyyvZjb8YUQw&r=x-VqZ7MQP0DYD9BF-N0nBw&m=CuA-KFSYsyiejFjWhzY9K81jCCSeBvoybe88FUJDRo0&s=XswYVhXUblXuLUlka_74N7XSk3XIcdA_8pCXjGLhhOw&e=.
— You are receiving this because you modified the open/close state. Reply to this email directly, view it on GitHubhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_chroma_issues_12-3Femail-5Fsource-3Dnotifications-26email-5Ftoken-3DAAEPL2BDMSKQ37CR26FA4JTPVTHOBA5CNFSM4CIKYGQ2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODVQRJTI-23issuecomment-2D492901581&d=DwMFaQ&c=CJqEzB1piLOyyvZjb8YUQw&r=WG01dcOd8ZFLFFNkrpbj6A&m=xJX0QCTjhYa1emVkJJc769bred_bN42apgr70-GsnJw&s=3_68lvEg1eMV0T1IZtZ_fXQvury-wFGa6DaJ9PVShAI&e=, or mute the threadhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_notifications_unsubscribe-2Dauth_AAEPL2AWVFO5JTBNWXPHE23PVTHOBANCNFSM4CIKYGQQ&d=DwMFaQ&c=CJqEzB1piLOyyvZjb8YUQw&r=WG01dcOd8ZFLFFNkrpbj6A&m=xJX0QCTjhYa1emVkJJc769bred_bN42apgr70-GsnJw&s=IbGehAIzCBGiEKk7kFxvmGUk2Z9_IowGjUBPBEQSUf4&e=.
But isn't the chroma
repository at a point where the master
is so outdated that everyone just uses the devel
branch for production anyway?
May I suggest that @bjoo make the develop branch the default branch? That way, when a user does a simple git clone https://github.com/JeffersonLab/chroma.git
the develop branch will be the one that is cloned. Furthermore, the develop branch will be the one presented on Chroma's GitHub main page.
Good idea
Sent from Bluehttp://www.bluemail.me/r?b=14874 On May 16, 2019, at 12:01 PM, Dean Howarth notifications@github.com<mailto:notifications@github.com> wrote:
May I suggest that @bjoohttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_bjoo&d=DwMCaQ&c=CJqEzB1piLOyyvZjb8YUQw&r=WG01dcOd8ZFLFFNkrpbj6A&m=we8FC8tee7r2MBXygoX75QehfEPFgLD1Msn6QpM4K4I&s=xM0Hww7haETLs7wVI7oFet-1-AGbBgUHbYKnS_jo-N4&e= make the develop branch the default branch? That way, when a user does a simple git clone https://github.com/JeffersonLab/chroma.git the develop branch will be the one that is cloned. Furthermore, the develop branch will be the one presented on Chroma's GitHub main page.
— You are receiving this because you were mentioned. Reply to this email directly, view it on GitHubhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_JeffersonLab_chroma_issues_12-3Femail-5Fsource-3Dnotifications-26email-5Ftoken-3DAAEPL2DQFIT4UYMKWTWZZ63PVWAMBA5CNFSM4CIKYGQ2YY3PNVWWK3TUL52HS4DFVREXG43VMVBW63LNMVXHJKTDN5WW2ZLOORPWSZGODVSIZ2A-23issuecomment-2D493128936&d=DwMCaQ&c=CJqEzB1piLOyyvZjb8YUQw&r=WG01dcOd8ZFLFFNkrpbj6A&m=we8FC8tee7r2MBXygoX75QehfEPFgLD1Msn6QpM4K4I&s=pG8AEXkeVdafr_DMQIXQOqROO-9sanThspStdwNQFrk&e=, or mute the threadhttps://urldefense.proofpoint.com/v2/url?u=https-3A__github.com_notifications_unsubscribe-2Dauth_AAEPL2FOGDLHUYQPTJTDFPDPVWAMBANCNFSM4CIKYGQQ&d=DwMCaQ&c=CJqEzB1piLOyyvZjb8YUQw&r=WG01dcOd8ZFLFFNkrpbj6A&m=we8FC8tee7r2MBXygoX75QehfEPFgLD1Msn6QpM4K4I&s=qEnUJ11Ca6MHGJLsKfkHbG6HRFyLNHX5Ri9NeQCk8Qk&e=.
But what is the point of making devel
the default branch? In that case devel
really is master
and there is no git flow with releases going on. If that is the case, one should just merge devel
into master
and remove devel
altogether.
Recently
git clone --recursive git@github.com:JeffersonLab/chroma.git
has begun failing.The issue seems to be a missing submodule,
wilsonmg
hosted on @bjoo's bitbucket, which seems to be a private repo.