-----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 Violetta,
On 6/2/17 9:43 AM, Violeta Georgieva wrote: > 2017-06-02 16:23 GMT+03:00 Christopher Schultz > <ch...@christopherschultz.net >> : >> > All, > > I've never done this before, and my git-fu is not strong. > > What's the best way to take a GitHub PR and merge it into e.g. > Tomcat trunk? I can definitely do it like this: > > 1. Grab the PR and convert it into a patch file > >> In the mail notification from Github there is link to the patch > >> e.g. > >> "Patch Links: > >> https://github.com/apache/tomcat/pull/57.patch >> https://github.com/apache/tomcat/pull/57.diff " >> http://marc.info/?l=tomcat-dev&m=149630485823205&w=2 I don't see any links like that in the emails from GitHub. For example: http://marc.info/?l=tomcat-dev&m=149635560007375&w=2 I can just add ".patch" to the end of the PR URL as Mark suggested, of course. > 2. Apply the patch to my local svn checkout 3. Commit to svn 4. > Reply to PR email saying something like "this closes PR #X" > >> Typically when I commit, I include to the commit message this >> "This closes #X" and the PR is closed automatically. Is GitHub watching our mailing list for commits? If I do an "svn commit" and merely mention "This closes #57", how does GitHub know which GitHub user's "issue #57" it belongs to? I'm just trying to understand how this all works. Thanks, - -chris -----BEGIN PGP SIGNATURE----- Comment: GPGTools - http://gpgtools.org Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/ iQIcBAEBCAAGBQJZMW2kAAoJEBzwKT+lPKRYAIUP/3uCQBx/1tpw0ZpppuuHrIi2 Snf9gFfeh4ypuPiGWZGeh7zrwf6CwJ/mZelWnZFC8FLHAEuvk+1BRt/r2qXL4/YG k4XimMqQ/+2yWpqHAI/UNYJbxiboMOolusvNPb1oZj6WLA8CNPE0QghkKVxpeqh9 Tk3+rOHtQ/yXynwMyArFOzLqtXtu9odBwJ/aG7G3HWEH4bNREy/O/ZpzG3koChGK ylfwhvlyvolScNJ6FLoKCKC10+PruG+nK8ftiIh74Z68P137qpYCyWJz4VOJOnFb SddDgM7YemRsj4avYq6jSYCRL24Dl3yDIvSzjBB+86lgMH/+0VnZSBWLibR/HtfF DRSMn29XZAMBoinv6z9cdVeboL4JdNqpS6u30NMMZ/clpg6218UZP5zkkjYg1hPZ tKYW3I/TRu6oYs/kqG4JXmwAFv9XD79QQQ2SOsIlDMgSIVlgE6o/MNlOKJ+RNVZJ 25uPjQ1PyJv/MHFaH2WopNftP3+RcGmpTQDxepIvcpyDecv95MUzbSpey2IiqPHV soErf1OSHDsJ0EU2aXT6GFaSJz3oj0R+RiJ43Jwrg5EKMDSJaeayRCFEUIRX+wH8 uO04boCH5N+fX68uby+1tRoowEJRgQ8PONR1VSRA4fFoa3K/YI1+a5wcQznMl64V t32pSDqu9VtG2sWOLrod =Hf0m -----END PGP SIGNATURE----- --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
