You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by Christopher Schultz <ch...@christopherschultz.net> on 2019/04/23 13:54:22 UTC
Finally getting around to switching to Git
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
All,
I haven't updated my local working copies of Tomcat source since the
move to Git. I'm going to do that, now, and I'm looking for advice.
Specifically, which repo is "better" -- gitbox or GitHub? I'm guessing
the its all go to the same place eventually. Should committers use
gitbox for direct-commits? If I use GitHub, will my commits require
some other review? Do I have to link my GitHub account with my ASF
LDAP id? Is one of them reliably faster?
Some guidance would be appreciated.
Thanks,
- -chris
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAly/GQ4ACgkQHPApP6U8
pFgOgRAAyJwFf1rJw9TjQDPqeGekcSzchfflAxplYu6F5o8GFvwkxDeVzHgxGXe8
Z9t5Oq+Fonmj62rvepxxIarXTTqRCqpsmRIYTzZ8LXwMzlBuZIOeM6ilTijo5HgG
YDWocwLOY7cSIPXtqSBa7zDlloO27drBnb14kadoXJRpqBmwQnssOKOU2hInKzhJ
/SJBp7r//d1tVYSo4J1wRqKigOi8RojafqM1+rh61L1CJlBVK9PCNjdzeP/ewm3l
TBVWekhqDWTXcogEJ7PsxH+zPrfp5EDG03tAl3q7nho/yA1MN0XwTjw3hxbHPCg9
pKZ+UJzCQpczsJTl5hxR1BemVGZHsReFTZyUEl1AEJDxeg8bXiPtI6AlIN3fYOjP
eJC8kZcoH4Jcge767DuOPQCc1uPyrR1cINl7ajRGdeU1nGTUhwgjZjDRB1eiCTVn
glzK9o88/mpPNEv3ruP/LdnLlj6so+ax4bokxqfnfrBzInYx+jeWiROY/HKik1sA
ysCOEg4tvNazaop26xDMJ5MNROUVcmhd+v2CbM8nZh+6nOoigf8xbRLgT6iJUcDp
2CgJnWkSIIzadaG4N6CaCHDs03/9jkgDio00nQNDrVS9ufTGlf618bsUHl+Z9wWx
BMo/cLoKOvPasRRIkJRtEzm2VEp4CiPCMq+SLNuiwqkpZ25MRP0=
=1wFC
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Finally getting around to switching to Git
Posted by Coty Sutherland <cs...@apache.org>.
On Tue, Apr 23, 2019 at 10:33 AM Rémy Maucherat <re...@apache.org> wrote:
> On Tue, Apr 23, 2019 at 4:29 PM Christopher Schultz <
> chris@christopherschultz.net> wrote:
>
> > -----BEGIN PGP SIGNED MESSAGE-----
> > Hash: SHA256
> >
> > Rémy,
> >
> > On 4/23/19 10:07, Rémy Maucherat wrote:
> > > On Tue, Apr 23, 2019 at 3:54 PM Christopher Schultz <
> > > chris@christopherschultz.net> wrote:
> > >
> > > All,
> > >
> > > I haven't updated my local working copies of Tomcat source since
> > > the move to Git. I'm going to do that, now, and I'm looking for
> > > advice.
> > >
> > > Specifically, which repo is "better" -- gitbox or GitHub? I'm
> > > guessing the its all go to the same place eventually. Should
> > > committers use gitbox for direct-commits? If I use GitHub, will my
> > > commits require some other review? Do I have to link my GitHub
> > > account with my ASF LDAP id? Is one of them reliably faster?
> > >
> > >
> > >> I use github personally. No commit review is required (but for
> > >> example I used a PR for larger NIO changes, although in the end I
> > >> didn't really get any feedback).
> >
> > So did you fork the Tomcat project and you commit to your fork with
> > PRs usually? Or just for some stuff?
> >
>
> I did fork and I use it to do big stuff [this way I can accidentally trash
> the repo without too many problems too ;) ]. For small stuff I simply use
> the main repo instead.
>
+1. Since I'm not as experienced as others, I sometimes create a PR for
things I'm unsure about to be reviewed before pushing to master also :)
>
> Rémy
>
>
> >
> > - -chris
> > -----BEGIN PGP SIGNATURE-----
> > Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
> >
> > iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAly/IV0ACgkQHPApP6U8
> > pFgUFRAAmQLAO8Tn2eKDkcru+PptsybUG1aNYDpRAmAyARAZuu6m50E8HkS0urZ9
> > ZlYI4WN9SN6TZuoimnhJp8GzEmoX3nKkhMuGqvxsKLvM+QG7iEkfN1/hisf2/8im
> > C7exCA43U5TImja6Z+TaXZIV1ZFdoN5dbSzHdj+nACU0gctpjE+jurZ16unRdNCZ
> > ZlNZwJen2wKCDwmk9dedAHrVuK7mGgoNkkxj/gqeBimuVeqKSwt/85wGDG/tkqRv
> > 8JVe1OhiP/48t1T5P2cMURSUjRYsLeyqRNPjHzU+Bgi1eK/mvACqzDvRNnixU8l/
> > ZjhZGksqBTIBkDEY7C39JM0tDqjW5/N4CBovWBsM4ONAkSGiqzSKuUCn9hEGqBkq
> > t3RsWg6LJ3GfT40F3xXHhE2Z/txW5wZ6qrB9vozbbPHExCPAsRCbgQ3WfW8DxxT/
> > Wt7f+mdjGGYCmkiVsWG7+MimK1po14ANkBnE+Ylo9zd2GH6W29AC4aDOOuROOq2S
> > DLFhAlw9WxaioqtRE6mhDdadzAV0HfEnRDouZb9Ma6M7DfXoFE1BuQ7cQQeF8ItZ
> > FZ1VyiV5WOFu7+SHtePx+R6nFfsBpLNFoIEdisMn0WbTiGgoQGyJDlxazAQnuCFx
> > tKIsIDSDOOPbW8XL2bT96GpELAXFjcoOvchUh1dvblcM0Ir4DYM=
> > =i8Yc
> > -----END PGP SIGNATURE-----
> >
>
Re: Finally getting around to switching to Git
Posted by Rémy Maucherat <re...@apache.org>.
On Tue, Apr 23, 2019 at 4:29 PM Christopher Schultz <
chris@christopherschultz.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Rémy,
>
> On 4/23/19 10:07, Rémy Maucherat wrote:
> > On Tue, Apr 23, 2019 at 3:54 PM Christopher Schultz <
> > chris@christopherschultz.net> wrote:
> >
> > All,
> >
> > I haven't updated my local working copies of Tomcat source since
> > the move to Git. I'm going to do that, now, and I'm looking for
> > advice.
> >
> > Specifically, which repo is "better" -- gitbox or GitHub? I'm
> > guessing the its all go to the same place eventually. Should
> > committers use gitbox for direct-commits? If I use GitHub, will my
> > commits require some other review? Do I have to link my GitHub
> > account with my ASF LDAP id? Is one of them reliably faster?
> >
> >
> >> I use github personally. No commit review is required (but for
> >> example I used a PR for larger NIO changes, although in the end I
> >> didn't really get any feedback).
>
> So did you fork the Tomcat project and you commit to your fork with
> PRs usually? Or just for some stuff?
>
I did fork and I use it to do big stuff [this way I can accidentally trash
the repo without too many problems too ;) ]. For small stuff I simply use
the main repo instead.
Rémy
>
> - -chris
> -----BEGIN PGP SIGNATURE-----
> Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
>
> iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAly/IV0ACgkQHPApP6U8
> pFgUFRAAmQLAO8Tn2eKDkcru+PptsybUG1aNYDpRAmAyARAZuu6m50E8HkS0urZ9
> ZlYI4WN9SN6TZuoimnhJp8GzEmoX3nKkhMuGqvxsKLvM+QG7iEkfN1/hisf2/8im
> C7exCA43U5TImja6Z+TaXZIV1ZFdoN5dbSzHdj+nACU0gctpjE+jurZ16unRdNCZ
> ZlNZwJen2wKCDwmk9dedAHrVuK7mGgoNkkxj/gqeBimuVeqKSwt/85wGDG/tkqRv
> 8JVe1OhiP/48t1T5P2cMURSUjRYsLeyqRNPjHzU+Bgi1eK/mvACqzDvRNnixU8l/
> ZjhZGksqBTIBkDEY7C39JM0tDqjW5/N4CBovWBsM4ONAkSGiqzSKuUCn9hEGqBkq
> t3RsWg6LJ3GfT40F3xXHhE2Z/txW5wZ6qrB9vozbbPHExCPAsRCbgQ3WfW8DxxT/
> Wt7f+mdjGGYCmkiVsWG7+MimK1po14ANkBnE+Ylo9zd2GH6W29AC4aDOOuROOq2S
> DLFhAlw9WxaioqtRE6mhDdadzAV0HfEnRDouZb9Ma6M7DfXoFE1BuQ7cQQeF8ItZ
> FZ1VyiV5WOFu7+SHtePx+R6nFfsBpLNFoIEdisMn0WbTiGgoQGyJDlxazAQnuCFx
> tKIsIDSDOOPbW8XL2bT96GpELAXFjcoOvchUh1dvblcM0Ir4DYM=
> =i8Yc
> -----END PGP SIGNATURE-----
>
Re: Finally getting around to switching to Git
Posted by Christopher Schultz <ch...@christopherschultz.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Rémy,
On 4/23/19 10:07, Rémy Maucherat wrote:
> On Tue, Apr 23, 2019 at 3:54 PM Christopher Schultz <
> chris@christopherschultz.net> wrote:
>
> All,
>
> I haven't updated my local working copies of Tomcat source since
> the move to Git. I'm going to do that, now, and I'm looking for
> advice.
>
> Specifically, which repo is "better" -- gitbox or GitHub? I'm
> guessing the its all go to the same place eventually. Should
> committers use gitbox for direct-commits? If I use GitHub, will my
> commits require some other review? Do I have to link my GitHub
> account with my ASF LDAP id? Is one of them reliably faster?
>
>
>> I use github personally. No commit review is required (but for
>> example I used a PR for larger NIO changes, although in the end I
>> didn't really get any feedback).
So did you fork the Tomcat project and you commit to your fork with
PRs usually? Or just for some stuff?
- -chris
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAly/IV0ACgkQHPApP6U8
pFgUFRAAmQLAO8Tn2eKDkcru+PptsybUG1aNYDpRAmAyARAZuu6m50E8HkS0urZ9
ZlYI4WN9SN6TZuoimnhJp8GzEmoX3nKkhMuGqvxsKLvM+QG7iEkfN1/hisf2/8im
C7exCA43U5TImja6Z+TaXZIV1ZFdoN5dbSzHdj+nACU0gctpjE+jurZ16unRdNCZ
ZlNZwJen2wKCDwmk9dedAHrVuK7mGgoNkkxj/gqeBimuVeqKSwt/85wGDG/tkqRv
8JVe1OhiP/48t1T5P2cMURSUjRYsLeyqRNPjHzU+Bgi1eK/mvACqzDvRNnixU8l/
ZjhZGksqBTIBkDEY7C39JM0tDqjW5/N4CBovWBsM4ONAkSGiqzSKuUCn9hEGqBkq
t3RsWg6LJ3GfT40F3xXHhE2Z/txW5wZ6qrB9vozbbPHExCPAsRCbgQ3WfW8DxxT/
Wt7f+mdjGGYCmkiVsWG7+MimK1po14ANkBnE+Ylo9zd2GH6W29AC4aDOOuROOq2S
DLFhAlw9WxaioqtRE6mhDdadzAV0HfEnRDouZb9Ma6M7DfXoFE1BuQ7cQQeF8ItZ
FZ1VyiV5WOFu7+SHtePx+R6nFfsBpLNFoIEdisMn0WbTiGgoQGyJDlxazAQnuCFx
tKIsIDSDOOPbW8XL2bT96GpELAXFjcoOvchUh1dvblcM0Ir4DYM=
=i8Yc
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [OT] Finally getting around to switching to Git
Posted by Igal Sapir <is...@apache.org>.
Chris,
On 4/29/2019 12:18 PM, Christopher Schultz wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Igal,
>
> On 4/29/19 14:52, Igal Sapir wrote:
>> Chris,
>>
>> On Thu, Apr 25, 2019 at 12:08 PM Christopher Schultz <
>> chris@christopherschultz.net> wrote:
>>
>>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
>>>
>>> Igal,
>>>
>>> On 4/25/19 14:42, Igal Sapir wrote:
>>>> On 4/25/2019 11:30 AM, Coty Sutherland wrote:
>>>>> If you clone a single branch with no references such as `git
>>>>> clone apache/tomcat -b master --single-branch` then you get
>>>>> just the references/history for the master branch which
>>>>> results in about a 70M .git directory.
>>>> So one needs to consider whether that added layer of complexity
>>>> is worth the savings of 30M disk space, even when multiplied
>>>> over 3 branches. Imagine the reclaimed space after deleting the
>>>> local SVN directories ;)
>>> For Tomcat 8.5.x @ r1852558:
>>>
>>> $ du -hs .svn/ 41M .svn/
>> Are you sure that you have the whole history there? I am working
>> ATM on my Ubuntu workstation where I have a copy of the Tomcat 8.5
>> SVN. The disk usage is mostly in the tags directory and not in the
>> .svn:
>>
>> ux@u18:/workspace/src/tc8.5.x$ du -sh tags 1.2G tags
>> ux@u18:/workspace/src/tc8.5.x$ du -sh .svn 231M .svn
>> ux@u18:/workspace/src/tc8.5.x$ du -sh . 1.5G .
> Oh, heavens no. Checking-out the root of a project in svn is almost
> never a good idea. I've literally never checked-out /svn/[project]. I
> always check-out /svn/[project]/trunk or /svn/[project]/tags/[branch].
> Never even in private repositories, for the same reason: there is no
> reason ever to grab every tag and branch ever onto your own disk.
>
> Subversion is efficient on the server-side, but the client is dumb and
> will happily duplicate everything.
>
>> Each "tag" takes about 35MB:
>>
>> ux@u18:/workspace/src/tc8.5.x$ du -sh tags/TOMCAT_8_5_25 35M
>> tags/TOMCAT_8_5_25 ux@u18:/workspace/src/tc8.5.x$ du -sh
>> tags/TOMCAT_8_5_24 35M tags/TOMCAT_8_5_24
>> ux@u18:/workspace/src/tc8.5.x$ du -sh tags/TOMCAT_8_5_23 34M
>> tags/TOMCAT_8_5_23
> Yeah, you should never have grabbed those. It was a waste of time and
> disk space (and back-up time and disk space).
And now I know ;) I was actually banned from the apache.org network at
some point because downloading the whole Tomcat SVN repo used too many
requests per day.
But this was exactly my point when comparing SVN to Git. Your Git
repository of 80MB includes all of the history with all of the branches
and tags, so it's tiny compared to the gigabytes that SVN uses (1.5GB
for only tc8.5).
We are using Lightweight Tags [1] in Git so they barely take any disk space.
Igal
[1] https://git-scm.com/book/en/v2/Git-Basics-Tagging#_lightweight_tags
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [OT] Finally getting around to switching to Git
Posted by Christopher Schultz <ch...@christopherschultz.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Igal,
On 4/29/19 14:52, Igal Sapir wrote:
> Chris,
>
> On Thu, Apr 25, 2019 at 12:08 PM Christopher Schultz <
> chris@christopherschultz.net> wrote:
>
>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
>>
>> Igal,
>>
>> On 4/25/19 14:42, Igal Sapir wrote:
>>> On 4/25/2019 11:30 AM, Coty Sutherland wrote:
>>>> If you clone a single branch with no references such as `git
>>>> clone apache/tomcat -b master --single-branch` then you get
>>>> just the references/history for the master branch which
>>>> results in about a 70M .git directory.
>>>
>>> So one needs to consider whether that added layer of complexity
>>> is worth the savings of 30M disk space, even when multiplied
>>> over 3 branches. Imagine the reclaimed space after deleting the
>>> local SVN directories ;)
>>
>> For Tomcat 8.5.x @ r1852558:
>>
>> $ du -hs .svn/ 41M .svn/
>>
>>
> Are you sure that you have the whole history there? I am working
> ATM on my Ubuntu workstation where I have a copy of the Tomcat 8.5
> SVN. The disk usage is mostly in the tags directory and not in the
> .svn:
>
> ux@u18:/workspace/src/tc8.5.x$ du -sh tags 1.2G tags
> ux@u18:/workspace/src/tc8.5.x$ du -sh .svn 231M .svn
> ux@u18:/workspace/src/tc8.5.x$ du -sh . 1.5G .
Oh, heavens no. Checking-out the root of a project in svn is almost
never a good idea. I've literally never checked-out /svn/[project]. I
always check-out /svn/[project]/trunk or /svn/[project]/tags/[branch].
Never even in private repositories, for the same reason: there is no
reason ever to grab every tag and branch ever onto your own disk.
Subversion is efficient on the server-side, but the client is dumb and
will happily duplicate everything.
> Each "tag" takes about 35MB:
>
> ux@u18:/workspace/src/tc8.5.x$ du -sh tags/TOMCAT_8_5_25 35M
> tags/TOMCAT_8_5_25 ux@u18:/workspace/src/tc8.5.x$ du -sh
> tags/TOMCAT_8_5_24 35M tags/TOMCAT_8_5_24
> ux@u18:/workspace/src/tc8.5.x$ du -sh tags/TOMCAT_8_5_23 34M
> tags/TOMCAT_8_5_23
Yeah, you should never have grabbed those. It was a waste of time and
disk space (and back-up time and disk space).
- -chris
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlzHTgUACgkQHPApP6U8
pFgVBQ/9EyhUJFtunEWLsZLZvhmny0r4N0tnp961cQtsek3/uH3DBPakfVgW9JrA
8YcTuPVN0vpkjwFLukQ1xwDGhuUe02oQtcVbjrqQBCUsyLcOQbxXqisis28lMl+M
upAX8MB1BJuZSF6CCoSKZWmazC5JcFBdeTHKAXt5JloovgUNUWHF3TrH9jc78MoG
RCfIx+eZXwer+A6ERxofnVlorsZz7VQY6mMCPLGwMiS5X6u2/9MmkH84gYxwVbHu
FjJfItc8ddcGrZ+KXmkARmWD3dXExl/hpWRNo/Y+LLoIfb2Dsf55vsnyAWgfMmPV
mES7KqE8Y7W+tII19DoHJBi4zxXVwI4szk9MH0rdBcg22AuNPxDPG4kVefxbNtta
kmjH6HbaNP+J23+0rRFj1RnS77xzR4iIy1HJu0r5OQFqkqmEKcViD6ObvYUb7lWZ
WOkRLfLR7Sua1AQO1Y6muiw3EGvQ0Fr1gnGmyWwp8JzG8piHJnd3QZPU3BKmnNv3
raO1TUJ71knhD2mKS5C8yeMyDFDd0+dviUN0b75Nf+CUsc9sT4T9XTgejmCC13lJ
qFTathGwlMqsVdnpuAgtaaEvLGxJYfYYnyXT4uByF36yMNAMJN2q7k4j6wSJUEkA
YKc3Fg+I7DBeExqNYDbPHSwU2mD6NGScqvwmmfMXB+1qYHh7ZnU=
=Mimb
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [OT] Finally getting around to switching to Git
Posted by Igal Sapir <ig...@lucee.org>.
Chris,
On Thu, Apr 25, 2019 at 12:08 PM Christopher Schultz <
chris@christopherschultz.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Igal,
>
> On 4/25/19 14:42, Igal Sapir wrote:
> > On 4/25/2019 11:30 AM, Coty Sutherland wrote:
> >> If you clone a single branch with no references such as `git
> >> clone apache/tomcat -b master --single-branch` then you get just
> >> the references/history for the master branch which results in
> >> about a 70M .git directory.
> >
> > So one needs to consider whether that added layer of complexity is
> > worth the savings of 30M disk space, even when multiplied over 3
> > branches. Imagine the reclaimed space after deleting the local SVN
> > directories ;)
>
> For Tomcat 8.5.x @ r1852558:
>
> $ du -hs .svn/
> 41M .svn/
>
>
Are you sure that you have the whole history there? I am working ATM on my
Ubuntu workstation where I have a copy of the Tomcat 8.5 SVN. The disk
usage is mostly in the tags directory and not in the .svn:
ux@u18:/workspace/src/tc8.5.x$ du -sh tags
1.2G tags
ux@u18:/workspace/src/tc8.5.x$ du -sh .svn
231M .svn
ux@u18:/workspace/src/tc8.5.x$ du -sh .
1.5G .
Each "tag" takes about 35MB:
ux@u18:/workspace/src/tc8.5.x$ du -sh tags/TOMCAT_8_5_25
35M tags/TOMCAT_8_5_25
ux@u18:/workspace/src/tc8.5.x$ du -sh tags/TOMCAT_8_5_24
35M tags/TOMCAT_8_5_24
ux@u18:/workspace/src/tc8.5.x$ du -sh tags/TOMCAT_8_5_23
34M tags/TOMCAT_8_5_23
Igal
Re: [OT] Finally getting around to switching to Git
Posted by Igal Sapir <is...@apache.org>.
Chris,
On 4/25/2019 12:08 PM, Christopher Schultz wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Igal,
>
> On 4/25/19 14:42, Igal Sapir wrote:
>> On 4/25/2019 11:30 AM, Coty Sutherland wrote:
>>> If you clone a single branch with no references such as `git
>>> clone apache/tomcat -b master --single-branch` then you get just
>>> the references/history for the master branch which results in
>>> about a 70M .git directory.
>> So one needs to consider whether that added layer of complexity is
>> worth the savings of 30M disk space, even when multiplied over 3
>> branches. Imagine the reclaimed space after deleting the local SVN
>> directories ;)
> For Tomcat 8.5.x @ r1852558:
>
> $ du -hs .svn/
> 41M .svn/
Interesting. Maybe the tomcat-site SVN repo threw me off. I didn't
bother to look at the breakdown of the project and the site:
E:\Workspace\svn\tomcat\tomcat
> du -sh .
85M
E:\Workspace\svn\tomcat\tomcat
> cd ../site
E:\Workspace\svn\tomcat\site
> du -sh .
1.4G
Anyway, good to know. Thanks,
Igal
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: [OT] Finally getting around to switching to Git
Posted by Christopher Schultz <ch...@christopherschultz.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Igal,
On 4/25/19 14:42, Igal Sapir wrote:
> On 4/25/2019 11:30 AM, Coty Sutherland wrote:
>> If you clone a single branch with no references such as `git
>> clone apache/tomcat -b master --single-branch` then you get just
>> the references/history for the master branch which results in
>> about a 70M .git directory.
>
> So one needs to consider whether that added layer of complexity is
> worth the savings of 30M disk space, even when multiplied over 3
> branches. Imagine the reclaimed space after deleting the local SVN
> directories ;)
For Tomcat 8.5.x @ r1852558:
$ du -hs .svn/
41M .svn/
- -chris
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlzCBZkACgkQHPApP6U8
pFh/1g//aKPqBxa5PV6G1D17+LdnivuxF5BjfJgpz/DpvlAFiK0OP/osob4Yklbx
JXwF0kt6LWHI5jNBYPtlGRw77gourRAh85kxudwwBcebIqQ0Kqg8MV8BEgcZrPU5
CRp0P+LkbqRnXRyinpwY6c4pWoPnufh6F4jdadkmhssZFnKOZa45+vadMhwTSDsq
FrrtE5DhVhWFo1o4ee5HbRn71Q4lmDGXGS6QiEpb6Q2fRNrqn8+tYNNx5+sy/whk
piyX1df0XZvt/6mHtfkZfrhJPcLG1vZ0t5lmWvqZIZUftxpJikgGBBQVSVSQPcYU
HhR3ylD26fT0gianEivqK0JMheCw5jNYcz0UlqtjuQSQFajG/cUbK63hA3o7h9ls
bJU+gUy+3s+ewZxQUZVnvzWK4n7Zm9W+GqVR30Eiin5PtaCqd2qX08FqJjCk3h2D
ISkLJ3aymDmJ96zLgRGe3KSvSOl27Niv+NVrFyxxvymnzEgG6TmJaqZmYsbHud/k
kiXBGuvw6o1KB47RybyZdx6sloBTZfbIgzBkilLXcJKpHMJy+kwTltJeI1Z8tWCT
e4l13ikL7Oma2MBIQnOxUImmL2Q0oX5dwMY/ojnFWTAdBlPhLOi9kQ/TOTnuXDEK
AQh42hKrtK8gst/CEYwk7/2IhjbA6DB3E0EszBBYlehh972Xaz0=
=4QWj
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Finally getting around to switching to Git
Posted by Igal Sapir <is...@apache.org>.
Coty,
On 4/25/2019 11:30 AM, Coty Sutherland wrote:
> On Thu, Apr 25, 2019 at 2:06 PM Igal Sapir <is...@apache.org> wrote:
>
>> On 4/25/2019 10:56 AM, Coty Sutherland wrote:
>>> On Thu, Apr 25, 2019 at 1:32 PM Christopher Schultz <
>>> chris@christopherschultz.net> wrote:
>>>
>>>> -----BEGIN PGP SIGNED MESSAGE-----
>>>> Hash: SHA256
>>>>
>>>> Igal,
>>>>
>>>> On 4/23/19 12:52, Igal Sapir wrote:
>>>>> Another thing that I have changed in my workflow based on Mark's
>>>>> past suggestion, is that I keep a local repo for each major branch
>>>>> now.
>>>> Okay, I have done the following:
>>>>
>>>> 1. Fork tomcat master to my own GitHub account
>>>> 2. git clone URL
>>>> 3. edit/add/commit/push
>>>> 4. Create a PR
>>>>
>>>> I'm sure I can import the PR into tomcat-master. No problem.
>>>>
>>>> Now, when attempting to keep my fork current, I've always done
>>>> something like:
>>>>
>>>> git remote add upstream master-url
>>>> git checkout master
>>>> git fetch upstream
>>>>
>>>> And I'm all up-to-date.
>>>>
>>>> When I did that, I ended up bringing-down the 7.0.x and 8.5.x branches
>>>> as well. How can I limit the upstream to just the master?
>>>>
>>> You can set the branch for your remote to master (or do it when you
>> clone)
>>> which should ignore other branches:
>>> git remote set-branches upstream master
>>>
>>> Then optionally configure --no-tags in your git config (or use --no-tags
>>> each time you git-fetch):
>>> git config --add remote.upstream.tagOpt --no-tags
>>>
>>> Then try fetching to verify it worked:
>>> git fetch upstream [--dry-run]
>>>
>>>
>>>> Or does my fork have to have everything, but I have to checkout a
>>>> single branch? If so, I'm not sure how to do that.
>>>>
>>> It doesn't, but by default a `git fetch` pulls down all new work that
>>> exists on the remote, but not your local clone.
>> I am sure that Coty knows git better than I do, so if he says that it
>> doesn't then I stand corrected.
>>
> I don't know about that :) If you do a regular `git clone apache/tomcat` it
> will pull the master branch and then references/histories for all remote
> branches which for tomcat is about a 100M .git directory. If you clone a
> single branch with no references such as `git clone apache/tomcat -b master
> --single-branch` then you get just the references/history for the master
> branch which results in about a 70M .git directory.
So one needs to consider whether that added layer of complexity is worth
the savings of 30M disk space, even when multiplied over 3 branches.
Imagine the reclaimed space after deleting the local SVN directories ;)
I think that working with the https://github.com/apache/tomcat as the
origin will make things much easier for Chris. Especially with keeping
the local repo up to date with the origin since he wouldn't need to use
his fork.
Best,
Igal
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Finally getting around to switching to Git
Posted by Coty Sutherland <cs...@apache.org>.
On Thu, Apr 25, 2019 at 2:06 PM Igal Sapir <is...@apache.org> wrote:
> On 4/25/2019 10:56 AM, Coty Sutherland wrote:
> > On Thu, Apr 25, 2019 at 1:32 PM Christopher Schultz <
> > chris@christopherschultz.net> wrote:
> >
> >> -----BEGIN PGP SIGNED MESSAGE-----
> >> Hash: SHA256
> >>
> >> Igal,
> >>
> >> On 4/23/19 12:52, Igal Sapir wrote:
> >>> Another thing that I have changed in my workflow based on Mark's
> >>> past suggestion, is that I keep a local repo for each major branch
> >>> now.
> >> Okay, I have done the following:
> >>
> >> 1. Fork tomcat master to my own GitHub account
> >> 2. git clone URL
> >> 3. edit/add/commit/push
> >> 4. Create a PR
> >>
> >> I'm sure I can import the PR into tomcat-master. No problem.
> >>
> >> Now, when attempting to keep my fork current, I've always done
> >> something like:
> >>
> >> git remote add upstream master-url
> >> git checkout master
> >> git fetch upstream
> >>
> >> And I'm all up-to-date.
> >>
> >> When I did that, I ended up bringing-down the 7.0.x and 8.5.x branches
> >> as well. How can I limit the upstream to just the master?
> >>
> > You can set the branch for your remote to master (or do it when you
> clone)
> > which should ignore other branches:
> > git remote set-branches upstream master
> >
> > Then optionally configure --no-tags in your git config (or use --no-tags
> > each time you git-fetch):
> > git config --add remote.upstream.tagOpt --no-tags
> >
> > Then try fetching to verify it worked:
> > git fetch upstream [--dry-run]
> >
> >
> >> Or does my fork have to have everything, but I have to checkout a
> >> single branch? If so, I'm not sure how to do that.
> >>
> > It doesn't, but by default a `git fetch` pulls down all new work that
> > exists on the remote, but not your local clone.
>
> I am sure that Coty knows git better than I do, so if he says that it
> doesn't then I stand corrected.
>
I don't know about that :) If you do a regular `git clone apache/tomcat` it
will pull the master branch and then references/histories for all remote
branches which for tomcat is about a 100M .git directory. If you clone a
single branch with no references such as `git clone apache/tomcat -b master
--single-branch` then you get just the references/history for the master
branch which results in about a 70M .git directory.
Note: the sytnax above is because I alias hub (https://hub.github.com/) to
`git` :) Check it out if you'd like to stop visiting the GitHub web UI for
opening PRs, etc.
> Igal
>
>
>
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
Re: Finally getting around to switching to Git
Posted by Igal Sapir <is...@apache.org>.
On 4/25/2019 10:56 AM, Coty Sutherland wrote:
> On Thu, Apr 25, 2019 at 1:32 PM Christopher Schultz <
> chris@christopherschultz.net> wrote:
>
>> -----BEGIN PGP SIGNED MESSAGE-----
>> Hash: SHA256
>>
>> Igal,
>>
>> On 4/23/19 12:52, Igal Sapir wrote:
>>> Another thing that I have changed in my workflow based on Mark's
>>> past suggestion, is that I keep a local repo for each major branch
>>> now.
>> Okay, I have done the following:
>>
>> 1. Fork tomcat master to my own GitHub account
>> 2. git clone URL
>> 3. edit/add/commit/push
>> 4. Create a PR
>>
>> I'm sure I can import the PR into tomcat-master. No problem.
>>
>> Now, when attempting to keep my fork current, I've always done
>> something like:
>>
>> git remote add upstream master-url
>> git checkout master
>> git fetch upstream
>>
>> And I'm all up-to-date.
>>
>> When I did that, I ended up bringing-down the 7.0.x and 8.5.x branches
>> as well. How can I limit the upstream to just the master?
>>
> You can set the branch for your remote to master (or do it when you clone)
> which should ignore other branches:
> git remote set-branches upstream master
>
> Then optionally configure --no-tags in your git config (or use --no-tags
> each time you git-fetch):
> git config --add remote.upstream.tagOpt --no-tags
>
> Then try fetching to verify it worked:
> git fetch upstream [--dry-run]
>
>
>> Or does my fork have to have everything, but I have to checkout a
>> single branch? If so, I'm not sure how to do that.
>>
> It doesn't, but by default a `git fetch` pulls down all new work that
> exists on the remote, but not your local clone.
I am sure that Coty knows git better than I do, so if he says that it
doesn't then I stand corrected.
Igal
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Finally getting around to switching to Git
Posted by Coty Sutherland <cs...@apache.org>.
On Thu, Apr 25, 2019 at 1:32 PM Christopher Schultz <
chris@christopherschultz.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Igal,
>
> On 4/23/19 12:52, Igal Sapir wrote:
> > Another thing that I have changed in my workflow based on Mark's
> > past suggestion, is that I keep a local repo for each major branch
> > now.
>
> Okay, I have done the following:
>
> 1. Fork tomcat master to my own GitHub account
> 2. git clone URL
> 3. edit/add/commit/push
> 4. Create a PR
>
> I'm sure I can import the PR into tomcat-master. No problem.
>
> Now, when attempting to keep my fork current, I've always done
> something like:
>
> git remote add upstream master-url
> git checkout master
> git fetch upstream
>
> And I'm all up-to-date.
>
> When I did that, I ended up bringing-down the 7.0.x and 8.5.x branches
> as well. How can I limit the upstream to just the master?
>
You can set the branch for your remote to master (or do it when you clone)
which should ignore other branches:
git remote set-branches upstream master
Then optionally configure --no-tags in your git config (or use --no-tags
each time you git-fetch):
git config --add remote.upstream.tagOpt --no-tags
Then try fetching to verify it worked:
git fetch upstream [--dry-run]
>
> Or does my fork have to have everything, but I have to checkout a
> single branch? If so, I'm not sure how to do that.
>
It doesn't, but by default a `git fetch` pulls down all new work that
exists on the remote, but not your local clone.
>
> I'm just *sure* I'm gonna love git once I get this all figured out.
> All the cool kids seem to love it, so it must be better, right?
>
:D
>
> - -chris
> -----BEGIN PGP SIGNATURE-----
> Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
>
> iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlzB7zMACgkQHPApP6U8
> pFh2vA/9EnR8sJPLuF1pD31HECEckVVXnF0AlU2XzTjiPsWwDP+Z+jJAh5Q8KUG6
> zwdM17VuN3Yr3e6p55DGjD4EEn1OV2hxw1Ao/TnEJXHsDrt9Hhm9j0T4ddJRCPBk
> RSP2/by6pBneYr8jPnT0G9D2M+CZUI/cXIj4ntZ9w8+2lIOayR/B0H8Gfc077k+y
> hXza7mnxtm4W+mNfMz176Z19hn9culA6/Z9p/4ZqFAGwVnkItNvPKuJi+syfR9La
> LtJ3WY2Ut3g4KzL5D9YIrTzNf3rRKQLe8qgErUc18uhxOD8Ax5QG7x3VkXBlG8s1
> YFFvwVKmVNlG8pldle3eyBg/xE6IfxD5IYjWWPeScrpwSCnSSN2E77HyOqG1FlSl
> /F5x4b1Qo8lVUuD5jgYaUQOxHuwFmuM6jyHknJfzrHB3feLjwEYxMgTfDNJoPSd/
> 70Czh7at8HxYb5S9wQHWK4oZVSEpNoWENK0BnP2qyGbZ99kfIG1bo/Iev3P9etxx
> hWp1edDxb3msATQL3eyFCUhHis1T9nnVKK19y8XoPt0PqrmLUhc/Vm+RyGFxJLeS
> +xSU4v2GXsG07eQnK4jqLPUVV87PqFPKP+DHoFzE7rm8KYYtbgLtkmfhqKtvZnj7
> KZfqqYHViQzm6lP8CgWtPsOkbYh5xvkVZly2PiPPVC9v47Gp36U=
> =+ROt
> -----END PGP SIGNATURE-----
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
Re: Finally getting around to switching to Git
Posted by Tim Funk <fu...@apache.org>.
Or maybe confluence cwiki?
-Tim
On Fri, Apr 26, 2019 at 8:26 AM Coty Sutherland <cs...@apache.org> wrote:
> On Fri, Apr 26, 2019 at 3:13 AM Mark Thomas <ma...@apache.org> wrote:
> ...
> > I'd suggest sharing Git experiences is a topic of conversation at the
> > Hackathon.
> >
>
> +1, except I won't be there :( Is that something we can have someone take
> notes on and send to the dev list after?
>
>
Re: Finally getting around to switching to Git
Posted by Coty Sutherland <cs...@apache.org>.
On Fri, Apr 26, 2019 at 3:13 AM Mark Thomas <ma...@apache.org> wrote:
> On 25/04/2019 20:07, Christopher Schultz wrote:
> > On 4/25/19 14:03, Igal Sapir wrote:
>
> <snip/>
>
> >> In some projects it's easy to maintain a single repository and
> >> switch between branches, but I find the differences between 7.0.x
> >> and master to be so major that I chose to follow Mark's method and
> >> keep separate local copies where the IDE settings do not get
> >> mangled up each time I switch branches.
> >
> > Sounds good. What is Mark's Method™? Is it documented anywhere?
>
> Overly complicated ;) - and not yet.
>
> I'm currently using one checkout per major version because Eclipse can't
> handle Git worktrees. I think I'd prefer a single checkout with
> worktrees but until I can try it I don't know. I did try switching to
> IntelliJ as it can handle Git worktrees but the pain of switching IDEs
> was greater than the minor annoyance of multiple checkouts so I quickyl
> returned to Eclipse.
>
> I do have a GitHub fork that I intend to use for large patches that need
> review. I don't use it much.
>
> I'm still getting used to my local setup and tweaking the configuration
> here and there so it does what I want by default when I pull / push etc.
>
> I'd suggest sharing Git experiences is a topic of conversation at the
> Hackathon.
>
+1, except I won't be there :( Is that something we can have someone take
notes on and send to the dev list after?
>
> Mark
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
Re: Finally getting around to switching to Git
Posted by Mark Thomas <ma...@apache.org>.
On 25/04/2019 20:07, Christopher Schultz wrote:
> On 4/25/19 14:03, Igal Sapir wrote:
<snip/>
>> In some projects it's easy to maintain a single repository and
>> switch between branches, but I find the differences between 7.0.x
>> and master to be so major that I chose to follow Mark's method and
>> keep separate local copies where the IDE settings do not get
>> mangled up each time I switch branches.
>
> Sounds good. What is Mark's Method™? Is it documented anywhere?
Overly complicated ;) - and not yet.
I'm currently using one checkout per major version because Eclipse can't
handle Git worktrees. I think I'd prefer a single checkout with
worktrees but until I can try it I don't know. I did try switching to
IntelliJ as it can handle Git worktrees but the pain of switching IDEs
was greater than the minor annoyance of multiple checkouts so I quickyl
returned to Eclipse.
I do have a GitHub fork that I intend to use for large patches that need
review. I don't use it much.
I'm still getting used to my local setup and tweaking the configuration
here and there so it does what I want by default when I pull / push etc.
I'd suggest sharing Git experiences is a topic of conversation at the
Hackathon.
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Finally getting around to switching to Git
Posted by Igal Sapir <is...@apache.org>.
Chris,
On 4/25/2019 12:07 PM, Christopher Schultz wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Igal,
>
> On 4/25/19 14:03, Igal Sapir wrote:
>> Chris,
>>
>> On 4/25/2019 10:32 AM, Christopher Schultz wrote:
>>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
>>>
>>> Igal,
>>>
>>> On 4/23/19 12:52, Igal Sapir wrote:
>>>> Another thing that I have changed in my workflow based on
>>>> Mark's past suggestion, is that I keep a local repo for each
>>>> major branch now.
>>> Okay, I have done the following:
>>>
>>> 1. Fork tomcat master to my own GitHub account
>> Since you are a committer you don't need to this. That is useful
>> though if you want to show a large update so that others can review
>> it, but you can also do that in a new branch.
>>
>>> 2. git clone URL 3. edit/add/commit/push 4. Create a PR
>>>
>>> I'm sure I can import the PR into tomcat-master. No problem.
>>>
>>> Now, when attempting to keep my fork current, I've always done
>>> something like:
>>>
>>> git remote add upstream master-url git checkout master git fetch
>>> upstream
>>>
>>> And I'm all up-to-date.
>>>
>>> When I did that, I ended up bringing-down the 7.0.x and 8.5.x
>>> branches as well. How can I limit the upstream to just the
>>> master?
>>>
>>> Or does my fork have to have everything, but I have to checkout
>>> a single branch? If so, I'm not sure how to do that.
>> Your fork has the whole git repository, but fortunately git
>> manages resources much better than Subversion, for example, so it's
>> not too bad at all.
>>
>> You can see a list of the local branches and which branch you are
>> currently on with the command, `git branch`, which will show
>> something like this:
>>
>>> git branch
>> 7.0.x 8.5.x * master
> $ git branch
> * master
>
> So it looks like I forked the branch, which was the intent. To get
> this down to my local system, I just did a "git clone [my-repo-url]"
> and that's what I got.
I'm pretty sure that you have the whole repository with all three
branches, but only one local tracking branch (the default master
branch). Try to run `git branch -a` and it should show you all of the
branches, including remote ones.
I have set up a new local repo to test (hopefully my new line characters
are preserved in fixed font).:
igal@localhost c:\Temp
> git clone https://github.com/apache/tomcat
Cloning into 'tomcat'...
remote: Enumerating objects: 99, done.
remote: Counting objects: 100% (99/99), done.
remote: Compressing objects: 100% (50/50), done.
remote: Total 342523 (delta 54), reused 75 (delta 40), pack-reused
342424
Receiving objects: 100% (342523/342523), 88.78 MiB | 7.71 MiB/s, done.
Resolving deltas: 100% (225766/225766), done.
Checking out files: 100% (4005/4005), done.
igal@localhost c:\Temp
> cd tomcat
This is what you see now:
igal@localhost c:\Temp\tomcat
> git branch
* master
This shows the remote branches as well:
igal@localhost c:\Temp\tomcat
> git branch -a
* master
remotes/origin/7.0.x
remotes/origin/8.5.x
remotes/origin/HEAD -> origin/master
remotes/origin/master
Checking out a branch that exists remotely but not locally creates a
local branch that tracks the remote one:
igal@localhost c:\Temp\tomcat
> git checkout 8.5.x
Checking out files: 100% (1787/1787), done.
*Branch '8.5.x' set up to track remote branch '8.5.x' from 'origin'.*
Switched to a new branch '8.5.x'
Listing the branches now shows the new local branch:
igal@localhost c:\Temp\tomcat
> git branch -a
* 8.5.x
master
remotes/origin/7.0.x
remotes/origin/8.5.x
remotes/origin/HEAD -> origin/master
remotes/origin/master
>> The `*` denotes the current branch, so I am on the master branch.
>> Switching to the 8.5.x branch with `git checkout 8.5.x`
>>
>>> git checkout 8.5.x
>> Checking out files: 100% (1787/1787), done. Switched to branch
>> '8.5.x' Your branch is up to date with 'origin/8.5.x'.
>>
>> And then running again `git branch` will show the * next to 8.5.x:
>>
>>> git branch
>> 7.0.x * 8.5.x master
>>
>> In some projects it's easy to maintain a single repository and
>> switch between branches, but I find the differences between 7.0.x
>> and master to be so major that I chose to follow Mark's method and
>> keep separate local copies where the IDE settings do not get
>> mangled up each time I switch branches.
> Sounds good. What is Mark's Method™? Is it documented anywhere?
Most git users, as well as myself until recently, use one repository and
switch between branches as needed. You need to work on 7.0.x, you do
`git checkout 7.0.x`, work on it, commit and push your changes, and then
check out another branch to work on.
The changes between 7.0.x and 8.5.x are so vast that switching between
7.0.x and the other two branches messed up my IDE, so what I refer to as
Mark's Method™ is to have 3 local directories/repos (tomcat,
tomcat-8.5.x, tomcat-7.0.x), one for each main branch. Each
directory/repo stays on its own branch, and the branches are created .
When I want to synchronize them, I do a push in one directory, and then
a pull in the other. So for example let's say that I pushed something
on 7.0.x:
/workspace/src/tomcat-7.0.x$ git push
The next time I work on master or 8.5.x I first do `git pull` to bring
it up to date.
/workspace/src/tomcat$ git pull
That way each directory has its own IDE settings, and they do not get
messed up when I work on different branches.
Also, because I create the local tracking branches with `git checkout
<branchname>` from the remote branches, they are already set up to track
the respective remotes.
Hope this makes sense,
Igal
Re: Finally getting around to switching to Git
Posted by Christopher Schultz <ch...@christopherschultz.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Igal,
On 4/25/19 14:03, Igal Sapir wrote:
> Chris,
>
> On 4/25/2019 10:32 AM, Christopher Schultz wrote:
>> -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256
>>
>> Igal,
>>
>> On 4/23/19 12:52, Igal Sapir wrote:
>>> Another thing that I have changed in my workflow based on
>>> Mark's past suggestion, is that I keep a local repo for each
>>> major branch now.
>> Okay, I have done the following:
>>
>> 1. Fork tomcat master to my own GitHub account
>
> Since you are a committer you don't need to this. That is useful
> though if you want to show a large update so that others can review
> it, but you can also do that in a new branch.
>
>> 2. git clone URL 3. edit/add/commit/push 4. Create a PR
>>
>> I'm sure I can import the PR into tomcat-master. No problem.
>>
>> Now, when attempting to keep my fork current, I've always done
>> something like:
>>
>> git remote add upstream master-url git checkout master git fetch
>> upstream
>>
>> And I'm all up-to-date.
>>
>> When I did that, I ended up bringing-down the 7.0.x and 8.5.x
>> branches as well. How can I limit the upstream to just the
>> master?
>>
>> Or does my fork have to have everything, but I have to checkout
>> a single branch? If so, I'm not sure how to do that.
>
> Your fork has the whole git repository, but fortunately git
> manages resources much better than Subversion, for example, so it's
> not too bad at all.
>
> You can see a list of the local branches and which branch you are
> currently on with the command, `git branch`, which will show
> something like this:
>
>> git branch
> 7.0.x 8.5.x * master
$ git branch
* master
So it looks like I forked the branch, which was the intent. To get
this down to my local system, I just did a "git clone [my-repo-url]"
and that's what I got.
> The `*` denotes the current branch, so I am on the master branch.
> Switching to the 8.5.x branch with `git checkout 8.5.x`
>
>> git checkout 8.5.x
> Checking out files: 100% (1787/1787), done. Switched to branch
> '8.5.x' Your branch is up to date with 'origin/8.5.x'.
>
> And then running again `git branch` will show the * next to 8.5.x:
>
>> git branch
> 7.0.x * 8.5.x master
>
> In some projects it's easy to maintain a single repository and
> switch between branches, but I find the differences between 7.0.x
> and master to be so major that I chose to follow Mark's method and
> keep separate local copies where the IDE settings do not get
> mangled up each time I switch branches.
Sounds good. What is Mark's Method™? Is it documented anywhere?
- -chris
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlzCBY0ACgkQHPApP6U8
pFjFiQ/+NZUw8qibULk3l7q08ZJy4MB9JSOnvUpEVzUs59QZugA6W64M0t/Ciywj
/AQ4Cmj+SYlz6pe6ryJlL10cqii/UntSmUyYULxIUb7LbqRB6oKyg16v3qsb3BPJ
HlY6IjDfrFgNz7WOrIwhaireeS0k4v/a5m7yFp4YmWhePVISjnrYLkCQ9WSR1cWl
wNTBE3cBAq4g2PDzmzS/Fmd5Sm0MIiLhm1FdOoMeYNTVJFJm3+1MPbQ6bpni3nvV
t392j/he2csCLN6yR9L02GsTU2zlhWwjrL0t8X4b6HR6AU4WV+vjF9q7kv9ULYMW
UjPYwOYm/AykFJWN5S5YBfngMlleQkwTXGcmeAN68vju/9FxqyY6WIYXefoon+18
LiVPv2mHBlrAB70sSe6W2hcuUEPZDVuNauHILJDqkXM1EGx3KvzWT1I3PTvf3AAG
9ShbwRep2FLHHyiGd7/B4sny398SzxEW9D3wABl1nCMhuN2s7YAVzAKle75rUlTw
Fdw9JDmv+2zwz0dM1TPGVcgb7NsIn3pInSMSekrcUiZM4mfhLcYunwymWm4u4Ypt
O7KQbgnFzZ5BdnBrm3Qy3ng/B23gRhR7gYUFtIzVQwrbdZPAS0LFlyaQwfho/T1/
5QJSDdSm3R/eZ3xeSk87TS6M0ABtH0G5+AS1v1x973Hp/7yMEhA=
=eJB7
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Finally getting around to switching to Git
Posted by Igal Sapir <is...@apache.org>.
Chris,
On 4/25/2019 10:32 AM, Christopher Schultz wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Igal,
>
> On 4/23/19 12:52, Igal Sapir wrote:
>> Another thing that I have changed in my workflow based on Mark's
>> past suggestion, is that I keep a local repo for each major branch
>> now.
> Okay, I have done the following:
>
> 1. Fork tomcat master to my own GitHub account
Since you are a committer you don't need to this. That is useful though
if you want to show a large update so that others can review it, but you
can also do that in a new branch.
> 2. git clone URL
> 3. edit/add/commit/push
> 4. Create a PR
>
> I'm sure I can import the PR into tomcat-master. No problem.
>
> Now, when attempting to keep my fork current, I've always done
> something like:
>
> git remote add upstream master-url
> git checkout master
> git fetch upstream
>
> And I'm all up-to-date.
>
> When I did that, I ended up bringing-down the 7.0.x and 8.5.x branches
> as well. How can I limit the upstream to just the master?
>
> Or does my fork have to have everything, but I have to checkout a
> single branch? If so, I'm not sure how to do that.
Your fork has the whole git repository, but fortunately git manages
resources much better than Subversion, for example, so it's not too bad
at all.
You can see a list of the local branches and which branch you are
currently on with the command, `git branch`, which will show something
like this:
> git branch
7.0.x
8.5.x
* master
The `*` denotes the current branch, so I am on the master branch.
Switching to the 8.5.x branch with `git checkout 8.5.x`
> git checkout 8.5.x
Checking out files: 100% (1787/1787), done.
Switched to branch '8.5.x'
Your branch is up to date with 'origin/8.5.x'.
And then running again `git branch` will show the * next to 8.5.x:
> git branch
7.0.x
* 8.5.x
master
In some projects it's easy to maintain a single repository and switch
between branches, but I find the differences between 7.0.x and master to
be so major that I chose to follow Mark's method and keep separate local
copies where the IDE settings do not get mangled up each time I switch
branches.
> I'm just *sure* I'm gonna love git once I get this all figured out.
> All the cool kids seem to love it, so it must be better, right?
It is WAY better, and I'm not even cool (let alone a kid)!
Best,
Igal
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Finally getting around to switching to Git
Posted by Christopher Schultz <ch...@christopherschultz.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Igal,
On 4/23/19 12:52, Igal Sapir wrote:
> Another thing that I have changed in my workflow based on Mark's
> past suggestion, is that I keep a local repo for each major branch
> now.
Okay, I have done the following:
1. Fork tomcat master to my own GitHub account
2. git clone URL
3. edit/add/commit/push
4. Create a PR
I'm sure I can import the PR into tomcat-master. No problem.
Now, when attempting to keep my fork current, I've always done
something like:
git remote add upstream master-url
git checkout master
git fetch upstream
And I'm all up-to-date.
When I did that, I ended up bringing-down the 7.0.x and 8.5.x branches
as well. How can I limit the upstream to just the master?
Or does my fork have to have everything, but I have to checkout a
single branch? If so, I'm not sure how to do that.
I'm just *sure* I'm gonna love git once I get this all figured out.
All the cool kids seem to love it, so it must be better, right?
- -chris
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlzB7zMACgkQHPApP6U8
pFh2vA/9EnR8sJPLuF1pD31HECEckVVXnF0AlU2XzTjiPsWwDP+Z+jJAh5Q8KUG6
zwdM17VuN3Yr3e6p55DGjD4EEn1OV2hxw1Ao/TnEJXHsDrt9Hhm9j0T4ddJRCPBk
RSP2/by6pBneYr8jPnT0G9D2M+CZUI/cXIj4ntZ9w8+2lIOayR/B0H8Gfc077k+y
hXza7mnxtm4W+mNfMz176Z19hn9culA6/Z9p/4ZqFAGwVnkItNvPKuJi+syfR9La
LtJ3WY2Ut3g4KzL5D9YIrTzNf3rRKQLe8qgErUc18uhxOD8Ax5QG7x3VkXBlG8s1
YFFvwVKmVNlG8pldle3eyBg/xE6IfxD5IYjWWPeScrpwSCnSSN2E77HyOqG1FlSl
/F5x4b1Qo8lVUuD5jgYaUQOxHuwFmuM6jyHknJfzrHB3feLjwEYxMgTfDNJoPSd/
70Czh7at8HxYb5S9wQHWK4oZVSEpNoWENK0BnP2qyGbZ99kfIG1bo/Iev3P9etxx
hWp1edDxb3msATQL3eyFCUhHis1T9nnVKK19y8XoPt0PqrmLUhc/Vm+RyGFxJLeS
+xSU4v2GXsG07eQnK4jqLPUVV87PqFPKP+DHoFzE7rm8KYYtbgLtkmfhqKtvZnj7
KZfqqYHViQzm6lP8CgWtPsOkbYh5xvkVZly2PiPPVC9v47Gp36U=
=+ROt
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Finally getting around to switching to Git
Posted by Christopher Schultz <ch...@christopherschultz.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Igal,
On 4/23/19 12:52, Igal Sapir wrote:
> On 4/23/2019 8:48 AM, Martin Grigorov wrote:
>> On Tue, Apr 23, 2019, 17:29 Christopher Schultz <
>> chris@christopherschultz.net> wrote:
>>
>>> <snip/>
>>>>
>>>>> Setting up the account is needed. I failed to do it, and
>>>>> Mark told me I needed three green ticks there:
>>>>> https://gitbox.apache.org/setup/
>>> Thanks. Looks like I'm not a part of the ASF-org on GitHub.
>>>
>>> Anyone with the Karma to do so, can I be added to ASF-org on
>>> GitHub? My GitHub username is ChristopherSchultz.
>> Go to https://id.apache.org and enter your Github ID there.
>
> Right. You will also need to enable 2FA on GitHub [...]
Also done, thanks.
> Another thing that I have changed in my workflow based on Mark's
> past suggestion, is that I keep a local repo for each major branch
> now.
I had done that before, anyway. There shouldn't be any change for me,
there, then.
- -chris
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlzAjU0ACgkQHPApP6U8
pFg7JQ/9FlXMgJc+6mVRzWdQK5Ki7KLBrWK3b/jEet7vFb5Ej4w9L0C76BqDkQ0e
CPzA06K9BK8ywYXRe3PW6cyMgVWp9ZijVULDXermCk5s1VqSHKHhKTffTf8PNnF/
hKb+djvgfVdam0wEfx1T9WZHxcoPeAI6BWiviBcwodCnVIS/3l5VqJqS28mSfgs5
mg4+BtQN3qMmlhGq6uFYPWmR42YIIszm6+7kbzaq9KHrXtPrAqvTBNxo+Y3a28Rx
jaqqCB6iKru/W7BqlsyJCBA2yJccZpcrDvK9qI1iB91QR8yEkxhIGL9p+q9v48TY
EoHP1wA7fL9lmfS7yVciSn+q/5kTzuIHxsLCzlRSyCNUisr9HlTYPMiSCuucVW/7
b0rzj6B0m7ZhsYgooyok5XTntu3I0lzeL7SSdpt+JUgZ0stPvn8501voSMrmyHkZ
La2DoFGCF/vqFB2DG3UotSo2GgRKGHJMyW8KqUglvcegnge1nnP7oWfA2zGN/bKb
JRr8kFIGnV/vacifyI+/3ZiAKWogEHTXi48xyF2bUxUJUCPMQHKPCdm9pe5wr4kC
m4OezaZy5QqipdjPEbqxpahtlL6ee+nwsQqfHoSm4KTdhnWq150/tifez3qMZSUE
OWFxpiYvTI+B1IWKP0SwUm/nm0j6+cNmT9rdeycMUIhMYo5+Cpw=
=MUIH
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Finally getting around to switching to Git
Posted by Igal Sapir <is...@apache.org>.
On 4/23/2019 8:48 AM, Martin Grigorov wrote:
> On Tue, Apr 23, 2019, 17:29 Christopher Schultz <
> chris@christopherschultz.net> wrote:
>
>> <snip/>
>>>
>>>> Setting up the account is needed. I failed to do it, and Mark
>>>> told me I needed three green ticks there:
>>>> https://gitbox.apache.org/setup/
>> Thanks. Looks like I'm not a part of the ASF-org on GitHub.
>>
>> Anyone with the Karma to do so, can I be added to ASF-org on GitHub?
>> My GitHub username is ChristopherSchultz.
> Go to https://id.apache.org and enter your Github ID there.
Right. You will also need to enable 2FA on GitHub (I am using the
FreeOTP app which works well for me), and when pushing commits I was
only able to use it with the https:// scheme and not with the git:// one.
Another thing that I have changed in my workflow based on Mark's past
suggestion, is that I keep a local repo for each major branch now.
While in the past I would use a single local repo and just switch
branches, I have found that it messes things up in the IDE etc. I
therefore now keep 3 local directories, each set to a different major
branch. It seemed contrary to most git workflows at first, but I find
that switching between branches that have major changes in the
development environment can get messy.
Best,
Igal
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Finally getting around to switching to Git
Posted by Christopher Schultz <ch...@christopherschultz.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Martin,
On 4/23/19 11:48, Martin Grigorov wrote:
> On Tue, Apr 23, 2019, 17:29 Christopher Schultz < Anyone with the
> Karma to do so, can I be added to ASF-org on GitHub? My GitHub
> username is ChristopherSchultz.
>
>
>> Go to https://id.apache.org and enter your Github ID there.
Done.
- -chris
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAlzAjCwACgkQHPApP6U8
pFgHoQ/+J138rhhyA+xVQqUaLr/st9s3LDsLkxUJtcRkhDblktnU/WBITdkSBeXU
13oISw2u8f8vBuOsVXvzcWhPsOr0JfxExeljRCtGQB1Kkh+moRhXVUbs9WxIfdYt
xtqRBwE0sntkjJ0hIsi1iQZ9J7sTIwvFWcuipN2KwWkpq1oE6Qngavs/O8Hlw8sT
4l2w4pk93sYaV8oy7zH7mFkRe5OLs5yPX1HaR2emxTLafMx2o5F6AZxNxg5Me/ys
LF70Ka4NnVo8j/GNLuiTMIYqtBTzR/GmJqiArgG9owRqNnXDi0U+BaV/LYANNF+5
cc84Ya69O/rnj375MShCy31qE5VzuNtiYluDqEG7q3aYxddbp+2Gle7cDyB30+yG
i2Gsay8adaaoKWHXRpLE2WuLLtD29+9CwCOzTXK2Ck/z8Am2mRgI30GMpXCgVsom
+aj+0YCkKAEkY6E+3zLP5qnTlgc+XFUjOX/ps9usUDE5wePQSWJUeFhlrjVizbLy
RHcWXuH7kVcgSfI0GLaPLnnNWZ4Mgns/XZv5f40z0lPg9UDV5pu+ILBLTOnxNLCv
Zk6nPlBRZWFJ3H2iN+93/ATW51o94/yg4ufBwfgefzDL0/bXSpAQQHI9rJEGV6bn
/GycTPpzJbIE0IaG1FhWbmNCr/AI5h8T/XW3pTOoG8DMiARgYpE=
=yYkr
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Finally getting around to switching to Git
Posted by Martin Grigorov <ma...@gmail.com>.
On Tue, Apr 23, 2019, 17:29 Christopher Schultz <
chris@christopherschultz.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> Rémy,
>
> On 4/23/19 10:07, Rémy Maucherat wrote:
> > On Tue, Apr 23, 2019 at 3:54 PM Christopher Schultz <
> > chris@christopherschultz.net> wrote:
> >
> > All,
> >
> > I haven't updated my local working copies of Tomcat source since
> > the move to Git. I'm going to do that, now, and I'm looking for
> > advice.
> >
> > Specifically, which repo is "better" -- gitbox or GitHub? I'm
> > guessing the its all go to the same place eventually. Should
> > committers use gitbox for direct-commits? If I use GitHub, will my
> > commits require some other review? Do I have to link my GitHub
> > account with my ASF LDAP id? Is one of them reliably faster?
> >
> >
> >> I use github personally. No commit review is required (but for
> >> example I used a PR for larger NIO changes, although in the end I
> >> didn't really get any feedback).
> >
> >> Setting up the account is needed. I failed to do it, and Mark
> >> told me I needed three green ticks there:
> >> https://gitbox.apache.org/setup/
> Thanks. Looks like I'm not a part of the ASF-org on GitHub.
>
> Anyone with the Karma to do so, can I be added to ASF-org on GitHub?
> My GitHub username is ChristopherSchultz.
>
Go to https://id.apache.org and enter your Github ID there.
> - -chris
> -----BEGIN PGP SIGNATURE-----
> Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
>
> iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAly/ISUACgkQHPApP6U8
> pFgFrQ/8DeucBQTlxJ4TVKVZIBbR5yqq7KoOqaEH3UWsZ4hFdudmWsGZoV+2zkbL
> NVaSJPaAGSu7uA2xH8dCeg/151V4PKBlbvV/Q00xiMF6cC58skneNurOdysJIyuX
> UdaUgLVu9juzRrXk4MnedenXFEJGGq7hVo+7APVKfmWju38Zut3iCpAzU8YNAaa1
> alKE0ZXopLWiBh07oTHIea7+fMdlxucgwPbcg3a4QmSR1sy8mH/qIwbSiWk+irWT
> EiFJKst7E13qAb1Zi3KuOtYny06jZWyTW3Jo8EzWRAHkMUUKEpG1WkXcl2gLw1qz
> IQAVXjIUT2rfCQK3bcdmwvhriM7tWAfaK4NETlxu77QgoSRuA0+DbZgvHIP73FRg
> MK/EORN15d+pQiB7ez//qwlHSm11+nJALynkWRhYb6q9LvNaq2kN6ympyiAch3PO
> bm4bj8gbXSgquSHNMvxcw3dLNjL9yySh9vJ17WBbkunLTW9dRjuuMYIXwTtPRB34
> lSfeZZP1iorBivbZeidS3WBUDXNXy0U9d/bFrJWfK25YR+2LqolIkokKXMx9H/MC
> KjaqFqn/uGBjLxjbLNEfAh/KksTR7zc2XfQTIXCJMyQnJvamuhw64BAinrOraUjS
> MdVCXfYWcfkZoHzpLl9svgVUX3GtptxoCxUCgMpih9akyuVLNOU=
> =VMk3
> -----END PGP SIGNATURE-----
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>
Re: Finally getting around to switching to Git
Posted by Christopher Schultz <ch...@christopherschultz.net>.
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256
Rémy,
On 4/23/19 10:07, Rémy Maucherat wrote:
> On Tue, Apr 23, 2019 at 3:54 PM Christopher Schultz <
> chris@christopherschultz.net> wrote:
>
> All,
>
> I haven't updated my local working copies of Tomcat source since
> the move to Git. I'm going to do that, now, and I'm looking for
> advice.
>
> Specifically, which repo is "better" -- gitbox or GitHub? I'm
> guessing the its all go to the same place eventually. Should
> committers use gitbox for direct-commits? If I use GitHub, will my
> commits require some other review? Do I have to link my GitHub
> account with my ASF LDAP id? Is one of them reliably faster?
>
>
>> I use github personally. No commit review is required (but for
>> example I used a PR for larger NIO changes, although in the end I
>> didn't really get any feedback).
>
>> Setting up the account is needed. I failed to do it, and Mark
>> told me I needed three green ticks there:
>> https://gitbox.apache.org/setup/
Thanks. Looks like I'm not a part of the ASF-org on GitHub.
Anyone with the Karma to do so, can I be added to ASF-org on GitHub?
My GitHub username is ChristopherSchultz.
- -chris
-----BEGIN PGP SIGNATURE-----
Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAly/ISUACgkQHPApP6U8
pFgFrQ/8DeucBQTlxJ4TVKVZIBbR5yqq7KoOqaEH3UWsZ4hFdudmWsGZoV+2zkbL
NVaSJPaAGSu7uA2xH8dCeg/151V4PKBlbvV/Q00xiMF6cC58skneNurOdysJIyuX
UdaUgLVu9juzRrXk4MnedenXFEJGGq7hVo+7APVKfmWju38Zut3iCpAzU8YNAaa1
alKE0ZXopLWiBh07oTHIea7+fMdlxucgwPbcg3a4QmSR1sy8mH/qIwbSiWk+irWT
EiFJKst7E13qAb1Zi3KuOtYny06jZWyTW3Jo8EzWRAHkMUUKEpG1WkXcl2gLw1qz
IQAVXjIUT2rfCQK3bcdmwvhriM7tWAfaK4NETlxu77QgoSRuA0+DbZgvHIP73FRg
MK/EORN15d+pQiB7ez//qwlHSm11+nJALynkWRhYb6q9LvNaq2kN6ympyiAch3PO
bm4bj8gbXSgquSHNMvxcw3dLNjL9yySh9vJ17WBbkunLTW9dRjuuMYIXwTtPRB34
lSfeZZP1iorBivbZeidS3WBUDXNXy0U9d/bFrJWfK25YR+2LqolIkokKXMx9H/MC
KjaqFqn/uGBjLxjbLNEfAh/KksTR7zc2XfQTIXCJMyQnJvamuhw64BAinrOraUjS
MdVCXfYWcfkZoHzpLl9svgVUX3GtptxoCxUCgMpih9akyuVLNOU=
=VMk3
-----END PGP SIGNATURE-----
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Finally getting around to switching to Git
Posted by Rémy Maucherat <re...@apache.org>.
On Tue, Apr 23, 2019 at 3:54 PM Christopher Schultz <
chris@christopherschultz.net> wrote:
> -----BEGIN PGP SIGNED MESSAGE-----
> Hash: SHA256
>
> All,
>
> I haven't updated my local working copies of Tomcat source since the
> move to Git. I'm going to do that, now, and I'm looking for advice.
>
> Specifically, which repo is "better" -- gitbox or GitHub? I'm guessing
> the its all go to the same place eventually. Should committers use
> gitbox for direct-commits? If I use GitHub, will my commits require
> some other review? Do I have to link my GitHub account with my ASF
> LDAP id? Is one of them reliably faster?
>
I use github personally. No commit review is required (but for example I
used a PR for larger NIO changes, although in the end I didn't really get
any feedback).
Setting up the account is needed. I failed to do it, and Mark told me I
needed three green ticks there:
https://gitbox.apache.org/setup/
Rémy
>
> Some guidance would be appreciated.
>
> Thanks,
> - -chris
> -----BEGIN PGP SIGNATURE-----
> Comment: Using GnuPG with Thunderbird - https://www.enigmail.net/
>
> iQIzBAEBCAAdFiEEMmKgYcQvxMe7tcJcHPApP6U8pFgFAly/GQ4ACgkQHPApP6U8
> pFgOgRAAyJwFf1rJw9TjQDPqeGekcSzchfflAxplYu6F5o8GFvwkxDeVzHgxGXe8
> Z9t5Oq+Fonmj62rvepxxIarXTTqRCqpsmRIYTzZ8LXwMzlBuZIOeM6ilTijo5HgG
> YDWocwLOY7cSIPXtqSBa7zDlloO27drBnb14kadoXJRpqBmwQnssOKOU2hInKzhJ
> /SJBp7r//d1tVYSo4J1wRqKigOi8RojafqM1+rh61L1CJlBVK9PCNjdzeP/ewm3l
> TBVWekhqDWTXcogEJ7PsxH+zPrfp5EDG03tAl3q7nho/yA1MN0XwTjw3hxbHPCg9
> pKZ+UJzCQpczsJTl5hxR1BemVGZHsReFTZyUEl1AEJDxeg8bXiPtI6AlIN3fYOjP
> eJC8kZcoH4Jcge767DuOPQCc1uPyrR1cINl7ajRGdeU1nGTUhwgjZjDRB1eiCTVn
> glzK9o88/mpPNEv3ruP/LdnLlj6so+ax4bokxqfnfrBzInYx+jeWiROY/HKik1sA
> ysCOEg4tvNazaop26xDMJ5MNROUVcmhd+v2CbM8nZh+6nOoigf8xbRLgT6iJUcDp
> 2CgJnWkSIIzadaG4N6CaCHDs03/9jkgDio00nQNDrVS9ufTGlf618bsUHl+Z9wWx
> BMo/cLoKOvPasRRIkJRtEzm2VEp4CiPCMq+SLNuiwqkpZ25MRP0=
> =1wFC
> -----END PGP SIGNATURE-----
>
> ---------------------------------------------------------------------
> To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
> For additional commands, e-mail: dev-help@tomcat.apache.org
>
>