You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@corinthia.apache.org by or...@apache.org on 2015/08/09 20:25:52 UTC
incubator-corinthia git commit: 0.07 .gitignore clean-up
Repository: incubator-corinthia
Updated Branches:
refs/heads/master ecf4f5b1c -> 4df29e8c6
0.07 .gitignore clean-up
Clarify how editing, IDE, and build artifacts are to be kept out of the
repository although the build/ directory can be used since anything in
that folder of a clone will be ignored.
Project: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/commit/4df29e8c
Tree: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/tree/4df29e8c
Diff: http://git-wip-us.apache.org/repos/asf/incubator-corinthia/diff/4df29e8c
Branch: refs/heads/master
Commit: 4df29e8c6ff6d4313b9f7f1eba68433d366cbf4c
Parents: ecf4f5b
Author: Dennis Hamilton <or...@apache.org>
Authored: Sun Aug 9 11:18:48 2015 -0700
Committer: Dennis Hamilton <or...@apache.org>
Committed: Sun Aug 9 11:18:48 2015 -0700
----------------------------------------------------------------------
.gitignore | 21 ++++++++-------------
1 file changed, 8 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-corinthia/blob/4df29e8c/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 292b673..f128ee5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,4 @@
-# .gitignore 0.06 UTF-8 2015-08-09
+# .gitignore 0.07 UTF-8 2015-08-09
#
# CORINTHIA/ROOT
# ==============
@@ -20,25 +20,20 @@
# Finder directory status files (OS X)
.DS_Store
-## ELIMINATION OF VISUAL STUDIO SOLUTIONS
-## --------------------------------------
-# Do not include working solutions in the repository tree. For Corinthia,
-# these will be built/extracted dynamically into the build/ folder as needed
-# and will not appear directly in the source tree.
-*.sln
-*.vcxproj
-*.vcxproj.filters
+## KEEP BUILD ARTIFACTS IN THE BUILD/ FOLDER AND OUT OUT OF THE REPOSITORY
+## -----------------------------------------------------------------------
-## KEEP BUILDS IN THE BUILD/ FOLDER
-## --------------------------------
build*/
-# If all build operations are carried out in either the build/ folder or
+# If all build operations are confined to the build/ folder or are conducted
# outside of the repository folder, they will be automatically excluded from
-# the repository.
+# the repository. Nothing produced by editors, IDEs, or build tools should
+# be placed anywhere else in the repository but build/.
+# 0.07 2015-08-09T11:12 Replace explicit ignore of Visual Studio artifacts
+# with a generic warning.
# 0.06 2015-08-09T10:17 Removed now-obsolete use of external/ as part of
# build usage.
# 0.05 2015-08-09T09:00 Add additional build exclusions based on recommended
Re: incubator-corinthia git commit: 0.07 .gitignore clean-up
Posted by jan i <ja...@apache.org>.
On Monday, August 10, 2015, Dennis E. Hamilton <de...@acm.org>
wrote:
> I do that because source tarballs of release code don't have history.
> Just a historical habit.
>
> Also, when I crib a file to a different project, likewise.
>
> Does it bother you so much that you don't want to see that kind of thing
> from me?
as Peter writes it is redundant info, but you argue well why you do it.
I have no problem with you doing it as you do it now. Just for completeness
(you know it, but others might not), adding your name would be a no go.
rgds
jan i
>
> - Dennis
>
> -----Original Message-----
> From: Peter Kelly [mailto:pmkelly@apache.org <javascript:;>]
> Sent: Sunday, August 9, 2015 21:01
> To: dev@corinthia.incubator.apache.org <javascript:;>
> Subject: Re: incubator-corinthia git commit: 0.07 .gitignore clean-up
>
> > On 10 Aug 2015, at 1:25 am, orcmid@apache.org <javascript:;> wrote:
> >
> > +# 0.07 2015-08-09T11:12 Replace explicit ignore of Visual Studio
> artifacts
> > +# with a generic warning.
> > # 0.06 2015-08-09T10:17 Removed now-obsolete use of external/ as part of
> > # build usage.
> > # 0.05 2015-08-09T09:00 Add additional build exclusions based on
> recommended
>
> Also just a note - git has built-in support for log messages, keeping a
> separate change log in individual files themselves is redundant :)
>
> —
> Dr Peter M. Kelly
> pmkelly@apache.org <javascript:;>
>
> PGP key: http://www.kellypmk.net/pgp-key <http://www.kellypmk.net/pgp-key>
> (fingerprint 5435 6718 59F0 DD1F BFA0 5E46 2523 BAA1 44AE 2966)
>
>
>
--
Sent from My iPad, sorry for any misspellings.
Re: incubator-corinthia git commit: 0.07 .gitignore clean-up
Posted by jan i <ja...@apache.org>.
On Monday, August 10, 2015, Peter Kelly <pm...@apache.org> wrote:
> Also one other point I forgot to mention about history for releases - this
> is available from the git repository for anyone who wants it, by going to
> the tag/branch for that particular release.
>
> Many projects include a ChangeLog file in their release with a summary of
> what’s changed (though not as detailed as individual files or a complete
> git log). I think ChangeLog files make sense on a per-release basis, then
> people can use that as a guide if they want to go into the git log and see
> all the details.
+1 a ChangeLog file as a simple git log extract makes sense.
>
> —
> Dr Peter M. Kelly
> pmkelly@apache.org <javascript:;>
>
> PGP key: http://www.kellypmk.net/pgp-key <http://www.kellypmk.net/pgp-key>
> (fingerprint 5435 6718 59F0 DD1F BFA0 5E46 2523 BAA1 44AE 2966)
>
> > On 10 Aug 2015, at 1:55 pm, Peter Kelly <pmkelly@apache.org
> <javascript:;>> wrote:
> >
> >> On 10 Aug 2015, at 11:51 am, Dennis E. Hamilton <
> dennis.hamilton@acm.org <javascript:;>> wrote:
> >>
> >> I do that because source tarballs of release code don't have history.
> Just a historical habit.
> >>
> >> Also, when I crib a file to a different project, likewise.
> >>
> >> Does it bother you so much that you don't want to see that kind of
> thing from me?
> >
> > It’s not a major problem if it’s only a few config files here and there
> like .gitignore. But I would not want to see it in source files. Looking at
> the git log, we have a very extensive history of changes, and including the
> commit messages (or even summaries) in every file would make them
> considerably larger. It also complicates merging.
I agree with you it would blow up the source for no reason, good argument.
> >
> > My preference is that we use git in the way it’s designed to be used,
> instead of a roll-your-own log system in individual files (esp. when many
> changes span multiple files). I don’t think I’ve ever seen anyone else do
> this in a project which already uses a version control system.
+1 it is mandatory that we keep the info in the version control system, the
other can only be extra.
I have seen a couple of projects that (somehow) get the git message
automatically inserted in the source, not something I like.
rgds
jan i
> >
> > —
> > Dr Peter M. Kelly
> > pmkelly@apache.org <javascript:;>
> >
> > PGP key: http://www.kellypmk.net/pgp-key <
> http://www.kellypmk.net/pgp-key>
> > (fingerprint 5435 6718 59F0 DD1F BFA0 5E46 2523 BAA1 44AE 2966)
> >
>
>
--
Sent from My iPad, sorry for any misspellings.
Re: incubator-corinthia git commit: 0.07 .gitignore clean-up
Posted by Peter Kelly <pm...@apache.org>.
Also one other point I forgot to mention about history for releases - this is available from the git repository for anyone who wants it, by going to the tag/branch for that particular release.
Many projects include a ChangeLog file in their release with a summary of what’s changed (though not as detailed as individual files or a complete git log). I think ChangeLog files make sense on a per-release basis, then people can use that as a guide if they want to go into the git log and see all the details.
—
Dr Peter M. Kelly
pmkelly@apache.org
PGP key: http://www.kellypmk.net/pgp-key <http://www.kellypmk.net/pgp-key>
(fingerprint 5435 6718 59F0 DD1F BFA0 5E46 2523 BAA1 44AE 2966)
> On 10 Aug 2015, at 1:55 pm, Peter Kelly <pm...@apache.org> wrote:
>
>> On 10 Aug 2015, at 11:51 am, Dennis E. Hamilton <de...@acm.org> wrote:
>>
>> I do that because source tarballs of release code don't have history. Just a historical habit.
>>
>> Also, when I crib a file to a different project, likewise.
>>
>> Does it bother you so much that you don't want to see that kind of thing from me?
>
> It’s not a major problem if it’s only a few config files here and there like .gitignore. But I would not want to see it in source files. Looking at the git log, we have a very extensive history of changes, and including the commit messages (or even summaries) in every file would make them considerably larger. It also complicates merging.
>
> My preference is that we use git in the way it’s designed to be used, instead of a roll-your-own log system in individual files (esp. when many changes span multiple files). I don’t think I’ve ever seen anyone else do this in a project which already uses a version control system.
>
> —
> Dr Peter M. Kelly
> pmkelly@apache.org
>
> PGP key: http://www.kellypmk.net/pgp-key <http://www.kellypmk.net/pgp-key>
> (fingerprint 5435 6718 59F0 DD1F BFA0 5E46 2523 BAA1 44AE 2966)
>
Re: incubator-corinthia git commit: 0.07 .gitignore clean-up
Posted by Peter Kelly <pm...@apache.org>.
> On 10 Aug 2015, at 11:51 am, Dennis E. Hamilton <de...@acm.org> wrote:
>
> I do that because source tarballs of release code don't have history. Just a historical habit.
>
> Also, when I crib a file to a different project, likewise.
>
> Does it bother you so much that you don't want to see that kind of thing from me?
It’s not a major problem if it’s only a few config files here and there like .gitignore. But I would not want to see it in source files. Looking at the git log, we have a very extensive history of changes, and including the commit messages (or even summaries) in every file would make them considerably larger. It also complicates merging.
My preference is that we use git in the way it’s designed to be used, instead of a roll-your-own log system in individual files (esp. when many changes span multiple files). I don’t think I’ve ever seen anyone else do this in a project which already uses a version control system.
—
Dr Peter M. Kelly
pmkelly@apache.org
PGP key: http://www.kellypmk.net/pgp-key <http://www.kellypmk.net/pgp-key>
(fingerprint 5435 6718 59F0 DD1F BFA0 5E46 2523 BAA1 44AE 2966)
RE: incubator-corinthia git commit: 0.07 .gitignore clean-up
Posted by "Dennis E. Hamilton" <de...@acm.org>.
I do that because source tarballs of release code don't have history. Just a historical habit.
Also, when I crib a file to a different project, likewise.
Does it bother you so much that you don't want to see that kind of thing from me?
- Dennis
-----Original Message-----
From: Peter Kelly [mailto:pmkelly@apache.org]
Sent: Sunday, August 9, 2015 21:01
To: dev@corinthia.incubator.apache.org
Subject: Re: incubator-corinthia git commit: 0.07 .gitignore clean-up
> On 10 Aug 2015, at 1:25 am, orcmid@apache.org wrote:
>
> +# 0.07 2015-08-09T11:12 Replace explicit ignore of Visual Studio artifacts
> +# with a generic warning.
> # 0.06 2015-08-09T10:17 Removed now-obsolete use of external/ as part of
> # build usage.
> # 0.05 2015-08-09T09:00 Add additional build exclusions based on recommended
Also just a note - git has built-in support for log messages, keeping a separate change log in individual files themselves is redundant :)
—
Dr Peter M. Kelly
pmkelly@apache.org
PGP key: http://www.kellypmk.net/pgp-key <http://www.kellypmk.net/pgp-key>
(fingerprint 5435 6718 59F0 DD1F BFA0 5E46 2523 BAA1 44AE 2966)
Re: incubator-corinthia git commit: 0.07 .gitignore clean-up
Posted by Peter Kelly <pm...@apache.org>.
> On 10 Aug 2015, at 1:25 am, orcmid@apache.org wrote:
>
> +# 0.07 2015-08-09T11:12 Replace explicit ignore of Visual Studio artifacts
> +# with a generic warning.
> # 0.06 2015-08-09T10:17 Removed now-obsolete use of external/ as part of
> # build usage.
> # 0.05 2015-08-09T09:00 Add additional build exclusions based on recommended
Also just a note - git has built-in support for log messages, keeping a separate change log in individual files themselves is redundant :)
—
Dr Peter M. Kelly
pmkelly@apache.org
PGP key: http://www.kellypmk.net/pgp-key <http://www.kellypmk.net/pgp-key>
(fingerprint 5435 6718 59F0 DD1F BFA0 5E46 2523 BAA1 44AE 2966)