2013/8/29 Oliver Heger <oliver.he...@oliver-heger.de> > Am 29.08.2013 12:31, schrieb sebb: > > On 29 August 2013 09:01, Benedikt Ritter <brit...@apache.org> wrote: > >> Hi, > >> > >> two questions about this: > >> > >> 1. What is the process for applying github pull requests? I guess one > has > >> to generate a patch file and apply it directly to the SVN Repo? > > > > It's difficult to track patches in mail messages, so I suggest > > creating a JIRA issue with the details. > > > >> 2. Do we add .gitignore files to our repos even though our primary SCM > is > >> SVN? It makes sense since everything is mirrored to git. > > > > I think that's OK; they don't do any harm. > The problem I see with .gitignore files is that they are likely to run > out of sync with the svn:ignore attributes. >
Good point. > > Not sure whether this helps in this special case, but there is an > alternative to a .gitignore file: the file .git/info/exclude in the > local git repository. Here a developer can add patterns for files to be > ignored as well. If a svn repository was cloned with git, the file can > be automatically populated from svn:ignore attributes using the command > git svn show-ignore > .git/info/exclude > Maybe we can document this somewhere on our website? > > Oliver > > > > > [Note that the Eclipse .project and .classpath files should NOT be > > committed to SVN; unfortunately they vary with the host > > configuration.] > > > >> Benedikt > >> > >> > >> 2013/8/24 mureinik <g...@git.apache.org> > >> > >>> GitHub user mureinik opened a pull request: > >>> > >>> https://github.com/apache/commons-lang/pull/8 > >>> > >>> Adding .gitignore to commons-lang > >>> > >>> Added .gitignore to the project in order to make working with git > >>> easier, and avoid accidentally commiting files that should not be > commited. > >>> > >>> These patches currently introduce two sets of ignored files: > >>> First patch: Maven's build products (the target folder) > >>> Second patch: IntelliJ IDEA's files > >>> > >>> I'll happily add other files (e.g., Eclipse's file, other IDEs) if > you > >>> wish. > >>> > >>> You can merge this pull request into a Git repository by running: > >>> > >>> $ git pull https://github.com/mureinik/commons-lang gitignore > >>> > >>> Alternatively you can review and apply these changes as the patch at: > >>> > >>> https://github.com/apache/commons-lang/pull/8.patch > >>> > >>> ---- > >>> > >>> ---- > >>> > >>> > >>> --------------------------------------------------------------------- > >>> To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org > >>> For additional commands, e-mail: dev-h...@commons.apache.org > >>> > >>> > >> > >> > >> -- > >> http://people.apache.org/~britter/ > >> http://www.systemoutprintln.de/ > >> http://twitter.com/BenediktRitter > >> http://github.com/britter > > > > --------------------------------------------------------------------- > > To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org > > For additional commands, e-mail: dev-h...@commons.apache.org > > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org > For additional commands, e-mail: dev-h...@commons.apache.org > > -- http://people.apache.org/~britter/ http://www.systemoutprintln.de/ http://twitter.com/BenediktRitter http://github.com/britter
