Re: [ALL][Math] git pull requests: how?

A merge commit is an additional commit unless you squash what you're merging. The entire history should be available. You can use --ff to only allow a fast forward commit so it doesn't add a merge commit, but then the branch you're merging has be to rebased on the one you're merging into. On 9

Re: [ALL][Math] git pull requests: how?

> On Mar 9, 2017, at 8:08 AM, Gilles wrote: > >> On Wed, 8 Mar 2017 10:37:44 -0600, Matt Sicker wrote: >> The "write to a PR branch" was something I mentioned in a different email. >> >> If you want a single command to merge a PR into master, assuming you've >>

Re: New git mirror created: commons-pool.git

Thanks! I don't think I'll be able to convert the repo until tomorrow, however. On 9 March 2017 at 02:11, Gary Gregory wrote: > FYI > -- Forwarded message -- > From: > Date: Wed, Mar 8, 2017 at 11:25 PM > Subject: New git mirror created:

Re: [ALL][Math] git pull requests: how?

On Thu, 9 Mar 2017 09:38:55 -0500, Rob Tompkins wrote: On Mar 9, 2017, at 8:08 AM, Gilles wrote: On Wed, 8 Mar 2017 10:37:44 -0600, Matt Sicker wrote: The "write to a PR branch" was something I mentioned in a different email. If you want a single command to

Re: [ALL][Math] git pull requests: how?

On Thu, 9 Mar 2017 12:01:08 -0600, Matt Sicker wrote: Try viewing the log like this: git log --oneline --decorate --graph It might be farther back in time, Oh yes, of course, you are right. I tested this with a fairly old pull request! Thanks and sorry for the noise, Gilles so the added

Re: [ALL][Math] git pull requests: how?

Try viewing the log like this: git log --oneline --decorate --graph It might be farther back in time, so the added commits won't show up at the top of the normal git log format. On 9 March 2017 at 11:48, Gilles wrote: > On Thu, 9 Mar 2017 11:34:42 -0600, Matt

Re: [ALL][Math] git pull requests: how?

On Thu, 9 Mar 2017 11:34:42 -0600, Matt Sicker wrote: A merge commit is an additional commit unless you squash what you're merging. The entire history should be available. You can use --ff to only allow a fast forward commit so it doesn't add a merge commit, but then the branch you're merging

Re: New git mirror created: commons-pool.git

The steps are pretty straightforward now: 1. Do a lazy majority vote to make sure nobody has problems with the migration. 2. Create a new git repo via the reporeq webapp. 3. Get the authors.txt file: https://git-wip-us.apache.org/authors.txt 4. Use git-svn to import the subversion repo (there are

Re: New git mirror created: commons-pool.git

Hi, Am 09.03.2017 um 15:58 schrieb Matt Sicker: > Thanks! I don't think I'll be able to convert the repo until tomorrow, > however. I would be interested to also move [configuration] to git, but - as usual - am pretty busy currently. Is there a documentation somewhere for the single steps that

Re: New git mirror created: commons-pool.git

I made a request the other day to move commons-pool, and they told me it was all self-serve now and they'd provide help if needed. On 9 March 2017 at 15:24, Benedikt Ritter wrote: > Hi, > > > Am 09.03.2017 um 21:30 schrieb Oliver Heger < > oliver.he...@oliver-heger.de>: > >

Re: New git mirror created: commons-pool.git

On 9 March 2017 at 21:24, Matt Sicker wrote: > The steps are pretty straightforward now: > > 1. Do a lazy majority vote to make sure nobody has problems with the > migration. > 2. Create a new git repo via the reporeq webapp. > 3. Get the authors.txt file:

Re: New git mirror created: commons-pool.git

You can use "git svn rebase" to pull down any updates from svn since you last imported by the way. I used to use git-svn when working with svn projects here, but that's not a very easy way to perform release management. On 9 March 2017 at 16:38, sebb wrote: > On 9 March 2017

Re: [VOTE] Release Apache Commons CLI 1.4 based on RC1

Oh, I did notice that the README.md still has 1.3.1 rather than 1.4 when referencing how to retrieve the Maven artifact. Is a "mvn commons:readme-md" required? On Fri, Mar 10, 2017 at 10:00 AM, Paul King wrote: > +1 (non-binding) > I checked md5/sha1/asc for the

Re: [VOTE] Release Apache Commons CLI 1.4 based on RC1

+1 (non-binding) I checked md5/sha1/asc for the sources jar and src zip. I ran "mvn test" from the src zip using Java 1.6.0_45 and Maven 3.2.5. I ran Apache Groovy's test suite against 1.4 which runs quite a few tests for CliBuilder (which has commons cli under the covers) as well as numerous

Re: Build failed in Jenkins: Commons-configuration #49

Am 09.03.2017 um 09:36 schrieb Dennis Kieselhorst: > Changed the build from JDK 1.6 to JDK 1.7 to fix that. > > See also https://issues.apache.org/jira/browse/INFRA-13556 Great! Many thanks! Oliver > > Regards > Dennis > > Am 08.03.2017 um 22:03 schrieb Apache Jenkins Server: >> Parsing

Re: New git mirror created: commons-pool.git

Hi, > Am 09.03.2017 um 21:30 schrieb Oliver Heger : > > Hi, > > Am 09.03.2017 um 15:58 schrieb Matt Sicker: >> Thanks! I don't think I'll be able to convert the repo until tomorrow, >> however. > > I would be interested to also move [configuration] to git, but -

Re: [VOTE] Release Apache Commons CLI 1.4 based on RC1

Hello Paul, > Am 10.03.2017 um 01:03 schrieb Paul King : > > Oh, I did notice that the README.md still has 1.3.1 rather than 1.4 > when referencing > how to retrieve the Maven artifact. Is a "mvn commons:readme-md" required? You’re right, it would be better to have

Re: [VOTE] Release Apache Commons CLI 1.4 based on RC1

[ X ] +1 Release these artifacts Builds fine on Apache Maven 3.3.9 Maven home: /usr/share/maven Java version: 1.8.0_121, vendor: Oracle Corporation Java home: /usr/lib/jvm/java-8-oracle/jre Default locale: en_NZ, platform encoding: UTF-8 OS name: "linux", version: "4.4.0-64-generic", arch:

Build failed in Jenkins: Commons-configuration #50

See -- Started by user Dennis Kieselhorst [EnvInject] - Loading node environment variables. Building remotely on ubuntu-us1 (ubuntu) in workspace

Fwd: New git mirror created: commons-pool.git

FYI -- Forwarded message -- From: Date: Wed, Mar 8, 2017 at 11:25 PM Subject: New git mirror created: commons-pool.git To: infrastruct...@apache.org, priv...@commons.apache.org New repository commons-pool.git was mirrored to git.a.o (and thus GitHub), as

Re: [VOTE][RESULT] Migrate commons-pool to git

Done: https://git-wip-us.apache.org/repos/asf?p=commons-pool.git Gary On Wed, Mar 8, 2017 at 10:39 PM, Gary Gregory wrote: > Done. It may take up to an hour for the request to be completed. > > Gary > > On Wed, Mar 8, 2017 at 6:06 PM, Matt Sicker

Fwd: New git repository created: commons-pool.git

FYI. -- Forwarded message -- From: Date: Wed, Mar 8, 2017 at 11:20 PM Subject: New git repository created: commons-pool.git To: infrastruct...@apache.org, priv...@commons.apache.org New repository commons-pool.git was created, as requested by ggregory. You may

Re: Build failed in Jenkins: Commons-configuration #49

Changed the build from JDK 1.6 to JDK 1.7 to fix that. See also https://issues.apache.org/jira/browse/INFRA-13556 Regards Dennis Am 08.03.2017 um 22:03 schrieb Apache Jenkins Server: > Parsing POMs > Established TCP socket on 44316 > maven33-agent.jar already up to date >

Jenkins build is back to normal : Commons-configuration #51

See - To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org For additional commands, e-mail: dev-h...@commons.apache.org

Build failed in Jenkins: commons-cli #16

See Changes: [britter] Make CheckStyle happy [britter] Exclude .htaccess file from RAT report [britter] Add description for next release [britter] Add CLI-269 to changes.xml

Jenkins build is back to normal : commons-cli #17

See - To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org For additional commands, e-mail: dev-h...@commons.apache.org

Re: [JENKINS] fixing builds that require less than Java 7

Hi, > Am 09.03.2017 um 13:29 schrieb sebb : > > Jenkins now requires Java 7 for running Maven builds > > However it is possible to use the -Pjava-1.6 (etc) profiles to > continue to build with the target JVM > > 1) Update the main JVM to at least 1.7 so Jenkins-Maven works >

Re: [ALL][Math] git pull requests: how?

On Wed, 8 Mar 2017 10:37:44 -0600, Matt Sicker wrote: The "write to a PR branch" was something I mentioned in a different email. If you want a single command to merge a PR into master, assuming you've already set up "github" as your github remote: $ git remote -v github

[JENKINS] fixing builds that require less than Java 7

Jenkins now requires Java 7 for running Maven builds However it is possible to use the -Pjava-1.6 (etc) profiles to continue to build with the target JVM 1) Update the main JVM to at least 1.7 so Jenkins-Maven works 2) add -Pjava-1.n to the Maven command line 3) Add the definition of

[VOTE] Release Apache Commons CLI 1.4 based on RC1

Hi, We have fixed some bugs and added two new features since CLI 1.3.1 was released, so I would like to release CLI 1.4. CLI 1.4 RC1 is available for review here: https://dist.apache.org/repos/dist/dev/commons/cli/cli-1.4-RC1/ (svn revision 18640) The tag is here: