[GitHub] matthiasblaesing commented on issue #619: Ant 1.10.4 emilian + fixes

[GitBox <gi...@apache.org>]

matthiasblaesing commented on issue #619: Ant 1.10.4 emilian + fixes
URL: https://github.com/apache/incubator-netbeans/pull/619#issuecomment-402538457
 
 
   @sijskes you are listed as the author in the commit. Git allows you to differ between the committer and the author. The author is the one that created the initial changeset, the committer is the one integrating the changeset. In many cases these two are identical, in other case (here) they are not.
   
   If a git formated patch is supplied, the easiest way for integration is:
   
   - change into the root of the project you are working with
   - fetch the patch: `wget -O diff.patch https://reviews.apache.org/r/67721/diff/raw/`
   - apply it with git: `git am diff.patch`
   - remove the patch: `rm diff.patch`
   
   After this, the changeset is commited to the branch, the executing user is set as the committer, the author is set as author.
   
   This is the result:
   
   ```
   matthias@athena:~/src/incubator-netbeans$ git log -n 1 --pretty=fuller
   commit 388b27ff749de94b979dc2097e571fd0ca721140 (HEAD -> test)
   Author:     Emilian Bold <em...@apache.org>
   AuthorDate: Mon Jun 25 20:16:57 2018 +0300
   Commit:     Matthias Bläsing <mb...@doppel-helix.eu>
   CommitDate: Wed Jul 4 20:17:15 2018 +0200
   
       Upgrades Ant to 1.10.4
   matthias@athena:~/src/incubator-netbeans$ 
   ```
   
   Maybe this helps.

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
users@infra.apache.org


With regards,
Apache Git Services

---------------------------------------------------------------------
To unsubscribe, e-mail: notifications-unsubscribe@netbeans.apache.org
For additional commands, e-mail: notifications-help@netbeans.apache.org

For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists