Re: [Math] Git weirdness?

Le jeu. 20 janv. 2022 à 20:43, Alex Herbert a écrit : > > On Thu, 20 Jan 2022 at 18:12, Gilles Sadowski wrote: > > > > Hello. > > > > Every time I run > > $ git checkout feature__MATH-1563__genetic_algorithm > > $ git rebase master > > git signals that it has to do a "3-way merge", that I shoul

Re: [Math] Git weirdness?

On Thu, 20 Jan 2022 at 18:12, Gilles Sadowski wrote: > > Hello. > > Every time I run > $ git checkout feature__MATH-1563__genetic_algorithm > $ git rebase master > git signals that it has to do a "3-way merge", that I should run > $ git pull > and this results in having duplicate commits; e.g.

[Math] Git weirdness?

Hello. Every time I run $ git checkout feature__MATH-1563__genetic_algorithm $ git rebase master git signals that it has to do a "3-way merge", that I should run $ git pull and this results in having duplicate commits; e.g. these three commits: e200f9ccbf85152a973c5f55c2107db39ef068ee bfe0

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 co

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 Sicker wrote: > >> A merge commit

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 h

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 Mar

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 merge a PR into master, assuming

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 >> already set up "github" as your

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 https://github.com/

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

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 pull github pull/42 git push Something like that should work. Since you're not running the git com

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

Hi. On Tue, 7 Mar 2017 22:06:11 -0600, Matt Sicker wrote: Found this link while trying to remember how to do this: https://help.github.com/articles/checking-out-pull-requests-locally/ Same docs as above, just from the source. It sounds like you can't write to a PR branch even if the author al

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

Found this link while trying to remember how to do this: https://help.github.com/articles/checking-out-pull-requests-locally/ Same docs as above, just from the source. It sounds like you can't write to a PR branch even if the author allows it, but the docs could be out of date (it happens!). On

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

On Thu, 2 Mar 2017 09:35:53 -0600, Matt Sicker wrote: Is the different behavior caused by svn versus git mirroring? The "Math" and "Numbers" projects both use git. Gilles That read-only branch feature is really cool. Some of this info might be useful to include in the template readme files a

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

Is the different behavior caused by svn versus git mirroring? That read-only branch feature is really cool. Some of this info might be useful to include in the template readme files and such for commons. On 2 March 2017 at 06:09, Gilles wrote: > On Thu, 2 Mar 2017 11:30:17 +, sebb wrote: >

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

On Thu, 2 Mar 2017 11:30:17 +, sebb wrote: This info (when validated) should be added to the Wiki: https://wiki.apache.org/commons/UsingGIT ... Oh, it already is there at the end Indeed, there is information there. That works: $ git fetch github pull/72/head:fix-foo-in-bar But is it s

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

This info (when validated) should be added to the Wiki: https://wiki.apache.org/commons/UsingGIT ... Oh, it already is there at the end On 2 March 2017 at 10:50, Gilles wrote: > On Wed, 1 Mar 2017 22:51:54 -0600, Matt Sicker wrote: >> >> Normally the GitHub email gives you the proper command

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

On Wed, 1 Mar 2017 22:51:54 -0600, Matt Sicker wrote: Normally the GitHub email gives you the proper command to use to pull the PR into your local git which you can merge and push (which merges the PR once GitHub gets updated from apache.org). As for making sure that email gets sent, if it's n

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

Normally the GitHub email gives you the proper command to use to pull the PR into your local git which you can merge and push (which merges the PR once GitHub gets updated from apache.org). As for making sure that email gets sent, if it's not, file an INFRA ticket about it. I've never tried it, bu

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

Hi. How should the project be configured such that the request posted here: https://issues.apache.org/jira/browse/MATH-1405 is as easy to handle as the one posted here: https://issues.apache.org/jira/browse/NUMBERS-4 ? Thanks, Gilles

Re: [Math] Git repository cleanup

If you aren't certain, you could create tags and delete branches. Just a thought, as a mechanism to minimize the number of branches in the repo. -Rob > On Apr 30, 2016, at 10:19 AM, Gilles wrote: > > Hi. > > $ git branch -r > origin/3.6-release > origin/3.6.1-release > origin/EXPERIMENTAL

[Math] Git repository cleanup

Hi. $ git branch -r origin/3.6-release origin/3.6.1-release origin/EXPERIMENTAL origin/HEAD -> origin/master origin/MANTISSA origin/MATH-1153 origin/MATH_1_1 origin/MATH_1_1_RC1 origin/MATH_1_3 origin/MATH_2_0 origin/MATH_2_X origin/MATH_3_X origin/complex-and-primitive-

Re: [commons-math] Git Push Summary

On Wed, 20 Apr 2016 00:53:25 + (UTC), er...@apache.org wrote: Repository: commons-math Updated Branches: refs/heads/feature-MATH-1290 [deleted] 90662a962 I had to delete that branch[1]; I've recreated a new one with the same name. [Hopefully nobody was tracking the old one.] Gilles [1]

Re: [Math] New branch for development (Was: [commons-math] Git Push Summary)

Le 25/02/2016 17:47, Gilles a écrit : > Hi. > > On Thu, 25 Feb 2016 16:09:27 + (UTC), er...@apache.org wrote: >> Repository: commons-math >> Updated Branches: >> refs/heads/develop [created] 050dfa6f0 > > I've created the branch "develop" as per > https://issues.apache.org/jira/browse/MAT

[Math] New branch for development (Was: [commons-math] Git Push Summary)

Hi. On Thu, 25 Feb 2016 16:09:27 + (UTC), er...@apache.org wrote: Repository: commons-math Updated Branches: refs/heads/develop [created] 050dfa6f0 I've created the branch "develop" as per https://issues.apache.org/jira/browse/MATH-1326 Please check out that branch and stop updating "

Re: [Math] Git misc (backport)

Git can merge through file moves too. On Wed, Jul 8, 2015 at 12:28 PM Phil Steitz wrote: > On 7/8/15 9:00 AM, James Ring wrote: > > You should be able to see all the branches with git branch -a. You can > > check them out to work on them, e.g. git checkout -b MATH_3_X > > remotes/origin/MATH_3_X

Re: [Math] Git misc (backport)

On 7/8/15 9:00 AM, James Ring wrote: > You should be able to see all the branches with git branch -a. You can > check them out to work on them, e.g. git checkout -b MATH_3_X > remotes/origin/MATH_3_X > > How do you want to backport? Are you looking to cherry-pick individual > changes from the maste

Re: [Math] Git misc (backport)

You should be able to see all the branches with git branch -a. You can check them out to work on them, e.g. git checkout -b MATH_3_X remotes/origin/MATH_3_X How do you want to backport? Are you looking to cherry-pick individual changes from the master branch back into 3_X? After you've checked out

Re: [Math] Git misc (backport)

On Wed, 08 Jul 2015 12:22:03 +, James Carman wrote: Try merging first On Wed, Jul 8, 2015 at 7:27 AM Gilles wrote: Hmm. What I need is a recipe from step _zero_: $ git remote -v show origin https://git-wip-us.apache.org/repos/asf/commons-math.git (fetch) origin https://git-wip-us.ap

Re: [Math] Git misc (backport)

Try merging first On Wed, Jul 8, 2015 at 7:27 AM Gilles wrote: > Hi. > > What is the easiest/fastest/safest way to backport changes to > the 3.x branch? > > Wouldn't it be a good idea to add some info about what other > branches exist into the "doc" directory (together with the > answer to the ab

[Math] Git misc (backport)

Hi. What is the easiest/fastest/safest way to backport changes to the 3.x branch? Wouldn't it be a good idea to add some info about what other branches exist into the "doc" directory (together with the answer to the above question)? Thanks, Gilles

Re: [math][git] newbie question: best way to backport?

You should still be able to cherry-pick. You'll just have some work to do to resolve the conflicts. You may be able to increase the rename detection with: git config merge.renameLimit You may also be able to create a patch using "git format-patch" and apply it using "git am -3". -- Chri

Re: [math][git] newbie question: best way to backport?

On 3/8/15 3:34 PM, Peter Ansell wrote: > Hi Phil, > > In the past I have used something like "git checkout -b temp-backport > && git rebase -i" to squash multiple backportable commits into a > single commit, and then it sometimes applies better (less conflicts in > some cases) than using cherry-pic

Re: [math][git] newbie question: best way to backport?

Hi Phil, In the past I have used something like "git checkout -b temp-backport && git rebase -i" to squash multiple backportable commits into a single commit, and then it sometimes applies better (less conflicts in some cases) than using cherry-pick on all of the individual commits. However, that

[math][git] newbie question: best way to backport?

cherry-pick barfs because paths have changed due to package rename. What is the best way to backport fixes to 3_X or the other way? Phil - To unsubscribe, e-mail: dev-unsubscr...@commons.apache.org For additional commands, e-mai

Re: [Math] What's in a release (Was: [Math] Git question (Was: [VOTE][RC3] Release ...))

Le 28/12/2014 00:22, sebb a écrit : > On 27 December 2014 at 22:19, Gilles wrote: >> On Sat, 27 Dec 2014 17:48:05 +, sebb wrote: >>> >>> On 24 December 2014 at 15:11, Gilles wrote: On Wed, 24 Dec 2014 15:52:12 +0100, Luc Maisonobe wrote: > > > Le 24/12/2014 15:04, Gilles

Re: [Math] What's in a release (Was: [Math] Git question (Was: [VOTE][RC3] Release ...))

On 27 December 2014 at 22:19, Gilles wrote: > On Sat, 27 Dec 2014 17:48:05 +, sebb wrote: >> >> On 24 December 2014 at 15:11, Gilles wrote: >>> >>> On Wed, 24 Dec 2014 15:52:12 +0100, Luc Maisonobe wrote: Le 24/12/2014 15:04, Gilles a écrit : > > > On Wed, 24 Dec 20

[Math] What's in a release (Was: [Math] Git question (Was: [VOTE][RC3] Release ...))

On Sat, 27 Dec 2014 17:48:05 +, sebb wrote: On 24 December 2014 at 15:11, Gilles wrote: On Wed, 24 Dec 2014 15:52:12 +0100, Luc Maisonobe wrote: Le 24/12/2014 15:04, Gilles a écrit : On Wed, 24 Dec 2014 09:31:46 +0100, Luc Maisonobe wrote: Le 24/12/2014 03:36, Gilles a écrit : On Tu

Re: [Math] Git question (Was: [VOTE][RC3] Release ...)

On 24 December 2014 at 15:11, Gilles wrote: > On Wed, 24 Dec 2014 15:52:12 +0100, Luc Maisonobe wrote: >> >> Le 24/12/2014 15:04, Gilles a écrit : >>> >>> On Wed, 24 Dec 2014 09:31:46 +0100, Luc Maisonobe wrote: Le 24/12/2014 03:36, Gilles a écrit : > > On Tue, 23 Dec 2014 14:02:

Re: [Math] Git question (Was: [VOTE][RC3] Release ...)

On Wed, 24 Dec 2014 15:52:12 +0100, Luc Maisonobe wrote: Le 24/12/2014 15:04, Gilles a écrit : On Wed, 24 Dec 2014 09:31:46 +0100, Luc Maisonobe wrote: Le 24/12/2014 03:36, Gilles a écrit : On Tue, 23 Dec 2014 14:02:40 +0100, luc wrote: This is a [VOTE] for releasing Apache Commons Math 3.4 fr

Re: [Math] Git question (Was: [VOTE][RC3] Release ...)

Le 24/12/2014 15:04, Gilles a écrit : > On Wed, 24 Dec 2014 09:31:46 +0100, Luc Maisonobe wrote: >> Le 24/12/2014 03:36, Gilles a écrit : >>> On Tue, 23 Dec 2014 14:02:40 +0100, luc wrote: This is a [VOTE] for releasing Apache Commons Math 3.4 from release candidate 3. Tag name:

Re: [Math] Git question (Was: [VOTE][RC3] Release ...)

On Wed, 24 Dec 2014 09:31:46 +0100, Luc Maisonobe wrote: Le 24/12/2014 03:36, Gilles a écrit : On Tue, 23 Dec 2014 14:02:40 +0100, luc wrote: This is a [VOTE] for releasing Apache Commons Math 3.4 from release candidate 3. Tag name: MATH_3_4_RC3 (signature can be checked from git using 'git

Re: [Math] Git question (Was: [VOTE][RC3] Release ...)

On Wed, 24 Dec 2014 03:56:10 +0100, Bernd Eckenfels wrote: Am Wed, 24 Dec 2014 03:36:42 +0100 schrieb Gilles : On Tue, 23 Dec 2014 14:02:40 +0100, luc wrote: Is there a way to check that the source code referred to above was the one used to create the JAR of the ".class" files. [Out of curiosit

Re: [Math] Git question (Was: [VOTE][RC3] Release ...)

Le 24/12/2014 03:36, Gilles a écrit : > On Tue, 23 Dec 2014 14:02:40 +0100, luc wrote: >> This is a [VOTE] for releasing Apache Commons Math 3.4 from release >> candidate 3. >> >> Tag name: >> MATH_3_4_RC3 (signature can be checked from git using 'git tag -v') >> >> Tag URL: >> >> >>

Re: [Math] Git question (Was: [VOTE][RC3] Release ...)

Am Wed, 24 Dec 2014 03:36:42 +0100 schrieb Gilles : > On Tue, 23 Dec 2014 14:02:40 +0100, luc wrote: > Is there a way to check that the source code referred to above > was the one used to create the JAR of the ".class" files. > [Out of curiosity, not suspicion, of course...] You can try to build

[Math] Git question (Was: [VOTE][RC3] Release ...)

On Tue, 23 Dec 2014 14:02:40 +0100, luc wrote: This is a [VOTE] for releasing Apache Commons Math 3.4 from release candidate 3. Tag name: MATH_3_4_RC3 (signature can be checked from git using 'git tag -v') Tag URL:

Re: [math] git

On 09/07/2014 04:38, Phil Steitz wrote: > On 7/8/14, 1:27 PM, Mark Thomas wrote: >> On 08/07/2014 18:26, Phil Steitz wrote: >>> On 7/8/14, 9:46 AM, Konstantin Kolinko wrote: 2014-07-05 19:54 GMT+04:00 Phil Steitz : > From the looks of [1] and the repo list at [2] it looks like all we >

Re: [math] git

On 7/8/14, 1:27 PM, Mark Thomas wrote: > On 08/07/2014 18:26, Phil Steitz wrote: >> On 7/8/14, 9:46 AM, Konstantin Kolinko wrote: >>> 2014-07-05 19:54 GMT+04:00 Phil Steitz : From the looks of [1] and the repo list at [2] it looks like all we have to do to get started is open an infra JIR

Re: [math] git

On 08/07/2014 18:26, Phil Steitz wrote: > On 7/8/14, 9:46 AM, Konstantin Kolinko wrote: >> 2014-07-05 19:54 GMT+04:00 Phil Steitz : >>> From the looks of [1] and the repo list at [2] it looks like all we >>> have to do to get started is open an infra JIRA and there should not >>> be a problem start

Re: [math] git

On 7/8/14, 9:46 AM, Konstantin Kolinko wrote: > 2014-07-05 19:54 GMT+04:00 Phil Steitz : >> From the looks of [1] and the repo list at [2] it looks like all we >> have to do to get started is open an infra JIRA and there should not >> be a problem starting with [math] by itself. Other commons >> c

Re: [math] git

2014-07-05 19:54 GMT+04:00 Phil Steitz : > From the looks of [1] and the repo list at [2] it looks like all we > have to do to get started is open an infra JIRA and there should not > be a problem starting with [math] by itself. Other commons > components can follow as and when they feel like it.

Re: [math] git

+1 Original message From: Luc Maisonobe Date:07/05/2014 2:25 PM (GMT-05:00) To: Commons Developers List Subject: Re: [math] git Le 05/07/2014 17:54, Phil Steitz a écrit : >>From the looks of [1] and the repo list at [2] it looks like all we > have to do to get s

Re: [math] git

Le 05/07/2014 17:54, Phil Steitz a écrit : >>From the looks of [1] and the repo list at [2] it looks like all we > have to do to get started is open an infra JIRA and there should not > be a problem starting with [math] by itself. Other commons > components can follow as and when they feel like it

[math] git

>From the looks of [1] and the repo list at [2] it looks like all we have to do to get started is open an infra JIRA and there should not be a problem starting with [math] by itself. Other commons components can follow as and when they feel like it. I am not a very experienced git user / admin, b

Re: [math] git svn setup

On 5/30/14, 10:02 AM, Evan Ward wrote: > On 05/30/2014 05:56 AM, Luc Maisonobe wrote: >> Le 30/05/2014 00:39, Mark Thomas a écrit : >>> On 29/05/2014 23:16, Evan Ward wrote: Hi, I'm trying to setup write access for the clone I have of the github [math] repository. I thought that

Re: [math] git svn setup

On 05/30/2014 05:56 AM, Luc Maisonobe wrote: > Le 30/05/2014 00:39, Mark Thomas a écrit : >> On 29/05/2014 23:16, Evan Ward wrote: >>> Hi, >>> >>> I'm trying to setup write access for the clone I have of the github >>> [math] repository. I thought that since every commit in that repository >>> alr

Re: [math] git svn setup

Le 30/05/2014 00:39, Mark Thomas a écrit : > On 29/05/2014 23:16, Evan Ward wrote: >> Hi, >> >> I'm trying to setup write access for the clone I have of the github >> [math] repository. I thought that since every commit in that repository >> already had a git-svn-id it would be relatively easy, so

Re: [math] git svn setup

On 29/05/2014 23:16, Evan Ward wrote: > Hi, > > I'm trying to setup write access for the clone I have of the github > [math] repository. I thought that since every commit in that repository > already had a git-svn-id it would be relatively easy, so I ran git svn > init and git svn fetch. But the f

[math] git svn setup

Hi, I'm trying to setup write access for the clone I have of the github [math] repository. I thought that since every commit in that repository already had a git-svn-id it would be relatively easy, so I ran git svn init and git svn fetch. But the fetch has been running for ~5 hours now and seems t