[sage-devel] Re: git question/request

Definitely +1 On Wednesday, March 29, 2023 at 10:32:15 AM UTC-7 John H Palmieri wrote: > Would it be a good idea for Sage tarballs, at least the development > versions, to come with `upstream` defined already? With a fresh 10.0.beta6 > tarball: > > % git remote -v > trac https://github.com/sage

[sage-devel] Re: git clone git://github.com/sagemath/sage.git didn't do what I expected

On Wednesday, October 28, 2020 at 10:34:13 AM UTC-7, Peter Mueller wrote: > > I just tried to follow the first few steps from the Developer's Guide > v9.2. From that I would have expected that after running "git clone git:// > github.com/sagemath/sage.git" I would find two branches of the source

Re: [sage-devel] Re: git trac fails to checkout a remote branch

On Thu, Nov 29, 2018 at 10:43 PM Emmanuel Charpentier wrote: > > The problem might be on trac : git branch --remote | grep 26791 diesn't > return anything... Why? git repo itself does not know anything about trac tickets. It's git trac extension that tries to match tickets to branches somehow.

[sage-devel] Re: git trac fails to checkout a remote branch

The problem might be on trac : git branch --remote | grep 26791 diesn't return anything... Le jeudi 29 novembre 2018 23:27:04 UTC+1, Emmanuel Charpentier a écrit : > > Trying to test Trac#26791 : > > charpent@zen-book-flip:/usr/local/sage-8$ git trac check

Re: [sage-devel] Re: git fetch fails

On 2018-10-21 11:57, Volker Braun wrote: Try "git remote prune origin" or "git remote update origin --prune" Thanks. The first one worked. -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails

[sage-devel] Re: git fetch fails

Try "git remote prune origin" or "git remote update origin --prune" On Sunday, October 21, 2018 at 11:13:18 AM UTC+2, Jeroen Demeyer wrote: > > Any ideas? > > error: cannot lock ref > 'refs/remotes/trac/u/embray/python3/sage-rings-polynomial-polydict/misc': > 'refs/remotes/trac/u/embray/pytho

Re: [sage-devel] Re: Git push issues

On Tue, Mar 6, 2018 at 11:24 PM, Luca De Feo wrote: >> No problem. And this was a mistake *I* made. This is a side-effect I >> did not consider and might want to think more about how to prevent... > > GitHub forbids using an ssh key twice. It seems the only reasonable thing to > do. Yes, I'm add

Re: [sage-devel] Re: Git push issues

> No problem. And this was a mistake *I* made. This is a side-effect I > did not consider and might want to think more about how to prevent... GitHub forbids using an ssh key twice. It seems the only reasonable thing to do. -- You received this message because you are subscribed to the Google Gr

Re: [sage-devel] Re: Git push issues

On Tue, Mar 6, 2018 at 7:29 PM, Meghana.M Reddy wrote: > This was the mistake I made. It worked now. Thanks a lot for helping me out. No problem. And this was a mistake *I* made. This is a side-effect I did not consider and might want to think more about how to prevent... > On Tuesday, March 6,

Re: [sage-devel] Re: Git push issues

Dear Erik, I'm able to push my branch now. Thank you for your quick reply and helping me with the SSH key. Regards, Meghana On Tuesday, March 6, 2018 at 9:35:01 PM UTC+5:30, Erik Bray wrote: > > Hi Meghana, > > I've manually deleted your duplicate SSH key, so you should be able to > push agai

[sage-devel] Re: Git push issues

This was the mistake I made. It worked now. Thanks a lot for helping me out. On Tuesday, March 6, 2018 at 9:01:56 PM UTC+5:30, Eric Gourgoulhon wrote: > > Hi, > > Le mardi 6 mars 2018 13:17:56 UTC+1, Meghana.M Reddy a écrit : >> >> ! [remote rejected] HEAD -> t/24909/boruvka_algorithm_for_mst (ho

Re: [sage-devel] Re: Git push issues

Hi Meghana, I've manually deleted your duplicate SSH key, so you should be able to push again for now. Best, E On Tue, Mar 6, 2018 at 5:02 PM, Erik Bray wrote: > There's also an issue that if you've made both a local account on the > Trac server, and you have logged in with GitHub (i.e. your >

Re: [sage-devel] Re: Git push issues

There's also an issue that if you've made both a local account on the Trac server, and you have logged in with GitHub (i.e. your gh- username), and if you've saved the same SSH key with both accounts, then the push authorization scripts can fail. This is because "" and "gh-" are treated as distinc

[sage-devel] Re: Git push issues

Le mardi 6 mars 2018 16:31:56 UTC+1, Eric Gourgoulhon a écrit : > > > The target on trac does not seem correct; the syntax of the push command > should be > > git push trac HEAD:u/user_name/branch_name > > > For more details, see http://doc.sagemath.org/html/en/developer/manual_git.html#pushing-

[sage-devel] Re: Git push issues

Hi, Le mardi 6 mars 2018 13:17:56 UTC+1, Meghana.M Reddy a écrit : > > ! [remote rejected] HEAD -> t/24909/boruvka_algorithm_for_mst (hook > declined) > error: failed to push some refs to 'g...@trac.sagemath.org:sage.git' > > The target on trac does not seem correct; the syntax of the push comma

Re: [sage-devel] Re: git trac is down ?

a reboot of the trac host fixed the problem. On Wednesday, September 13, 2017 at 8:31:11 AM UTC+1, David Roe wrote: > > I haven't been able to find a log and I need to go to sleep. Dima should > have access though > David > > On Wed, Sep 13, 2017 at 3:17 AM, Vincent Delecroix <20100.d...@gma

Re: [sage-devel] Re: git trac is down ?

I haven't been able to find a log and I need to go to sleep. Dima should have access though David On Wed, Sep 13, 2017 at 3:17 AM, Vincent Delecroix < 20100.delecr...@gmail.com> wrote: > > > On 13/09/2017 09:17, David Roe wrote: > >> On Wed, Sep 13, 2017 at 3:10 AM, Dima Pasechnik >> wrote:

Re: [sage-devel] Re: git trac is down ?

On 13/09/2017 09:17, David Roe wrote: On Wed, Sep 13, 2017 at 3:10 AM, Dima Pasechnik wrote: As I mentioned, this is not under our control which ports are blocked on GCE hosts, and which are not. I think it is (see https://cloud.google.com/compute/docs/vpc/using-firewalls), but I'm still

Re: [sage-devel] Re: git trac is down ?

On Wed, Sep 13, 2017 at 3:10 AM, Dima Pasechnik wrote: > As I mentioned, this is not under our control which ports are blocked on > GCE hosts, and which are not. > I think it is (see https://cloud.google.com/compute/docs/vpc/using-firewalls), but I'm still confused. If you look at our list of f

Re: [sage-devel] Re: git trac is down ?

As I mentioned, this is not under our control which ports are blocked on GCE hosts, and which are not. Why don't we merely retarget bots to pull branches from github? -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group

Re: [sage-devel] Re: git trac is down ?

On 13/09/2017 08:58, Volker Braun wrote: On Tuesday, September 12, 2017 at 10:00:32 PM UTC+2, Erik Bray wrote: It has *never* supported read-only access via HTTP or HTTPS. Afaik we have always supported git:// access and our documentation explicitly recommends setting it up that way; Its a

Re: [sage-devel] Re: git trac is down ?

On Tuesday, September 12, 2017 at 10:00:32 PM UTC+2, Erik Bray wrote: > > It has *never* supported read-only access via HTTP or HTTPS. > Afaik we have always supported git:// access and our documentation explicitly recommends setting it up that way; Its also how the git-trac script configures t

Re: [sage-devel] Re: git trac is down ?

On 13/09/2017 08:24, Vincent Delecroix wrote: On 12/09/2017 22:00, Erik Bray wrote: On Tue, Sep 12, 2017 at 9:59 PM, Dima Pasechnik wrote: On Tuesday, September 12, 2017 at 7:35:11 PM UTC+1, vdelecroix wrote: On 12/09/2017 20:32, Dima Pasechnik wrote: ah, right, do not use git://,  use

Re: [sage-devel] Re: git trac is down ?

On 12/09/2017 22:00, Erik Bray wrote: On Tue, Sep 12, 2017 at 9:59 PM, Dima Pasechnik wrote: On Tuesday, September 12, 2017 at 7:35:11 PM UTC+1, vdelecroix wrote: On 12/09/2017 20:32, Dima Pasechnik wrote: ah, right, do not use git://, use the same thing, g...@trac.sagemath.org:sage.git,

Re: [sage-devel] Re: git trac is down ?

Am 2017-09-13 um 08:20 schrieb Vincent Delecroix: > On 13/09/2017 08:17, Clemens Heuberger wrote: >> Am 2017-09-12 um 20:48 schrieb Vincent Delecroix: >>> On 12/09/2017 20:46, Clemens Heuberger wrote: Am 2017-09-12 um 20:33 schrieb Vincent Delecroix: > On 12/09/2017 20:32, Dima Pasechnik w

Re: [sage-devel] Re: git trac is down ?

On 13/09/2017 08:17, Clemens Heuberger wrote: Am 2017-09-12 um 20:48 schrieb Vincent Delecroix: On 12/09/2017 20:46, Clemens Heuberger wrote: Am 2017-09-12 um 20:33 schrieb Vincent Delecroix: On 12/09/2017 20:32, Dima Pasechnik wrote: ah, right, do not use git://, use the same thing, g...@tr

[sage-devel] Re: git trac is down ?

In case nobody has noticed, let me insist that this behaviour is currently preventing most (if not all) the patchbots from doing anything. Frederic Le mardi 12 septembre 2017 12:04:42 UTC+2, Frédéric Chapoton a écrit : > > I have access failures to the git repo from trac : > > chapoton@pc-chapot

Re: [sage-devel] Re: git trac is down ?

Am 2017-09-12 um 20:48 schrieb Vincent Delecroix: > On 12/09/2017 20:46, Clemens Heuberger wrote: >> Am 2017-09-12 um 20:33 schrieb Vincent Delecroix: >>> On 12/09/2017 20:32, Dima Pasechnik wrote: ah, right, do not use git://, use the same thing, g...@trac.sagemath.org:sage.git, for bot

Re: [sage-devel] Re: git trac is down ?

On Tue, Sep 12, 2017 at 9:59 PM, Dima Pasechnik wrote: > > > On Tuesday, September 12, 2017 at 7:35:11 PM UTC+1, vdelecroix wrote: >> >> On 12/09/2017 20:32, Dima Pasechnik wrote: >> > ah, right, do not use git://, use >> > the same thing, g...@trac.sagemath.org:sage.git, for both push and fetch.

Re: [sage-devel] Re: git trac is down ?

On Tuesday, September 12, 2017 at 7:35:11 PM UTC+1, vdelecroix wrote: > > On 12/09/2017 20:32, Dima Pasechnik wrote: > > ah, right, do not use git://, use > > the same thing, g...@trac.sagemath.org:sage.git, for both push and fetch. > > We should not force a user to upload her ssh key on trac

Re: [sage-devel] Re: git trac is down ?

On 12/09/2017 20:46, Clemens Heuberger wrote: Am 2017-09-12 um 20:33 schrieb Vincent Delecroix: On 12/09/2017 20:32, Dima Pasechnik wrote: ah, right, do not use git://, use the same thing, g...@trac.sagemath.org:sage.git, for both push and fetch. We should not force a user to upload her ssh

Re: [sage-devel] Re: git trac is down ?

Am 2017-09-12 um 20:33 schrieb Vincent Delecroix: > On 12/09/2017 20:32, Dima Pasechnik wrote: >> ah, right, do not use git://, use >> the same thing, g...@trac.sagemath.org:sage.git, for both push and fetch. > > We should not force a user to upload her ssh key on trac in order to pull a > branc

Re: [sage-devel] Re: git trac is down ?

On 12/09/2017 20:32, Dima Pasechnik wrote: ah, right, do not use git://, use the same thing, g...@trac.sagemath.org:sage.git, for both push and fetch. We should not force a user to upload her ssh key on trac in order to pull a branch. we have seen this before, firewalls don't like git://

Re: [sage-devel] Re: git trac is down ?

ah, right, do not use git://, use the same thing, g...@trac.sagemath.org:sage.git, for both push and fetch. we have seen this before, firewalls don't like git:// -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group an

Re: [sage-devel] Re: git trac is down ?

Am 2017-09-12 um 12:53 schrieb Dima Pasechnik: > works for me... (from UK) what is your git remote configuration? So basically, is the failure in authenticated mode reproducible? Clemens > > On Tuesday, September 12, 2017 at 11:04:42 AM UTC+1, Frédéric Chapoton wrote: > > I have access fai

[sage-devel] Re: git trac is down ?

This works for me with the "mangouste" setting: git remote -v origin https://github.com/sagemath/sage.git (fetch) origin https://github.com/sagemath/sage.git (push) trac g...@trac.sagemath.org:sage.git (fetch) trac g...@trac.sagemath.org:sage.git (push) Le mardi 12 septembre 2017 12:04:42 UTC+2,

[sage-devel] Re: git trac is down ?

works for me... (from UK) On Tuesday, September 12, 2017 at 11:04:42 AM UTC+1, Frédéric Chapoton wrote: > > I have access failures to the git repo from trac : > > chapoton@pc-chapoton:~/sage$ git pull trac > u/mantepse/fricas_output_and_sage_conversion_bug > fatal: read error: Connexion ré-initi

[sage-devel] Re: git trac try

Thanks Paul and Volker for your answers. Best wishes, Eric. -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email to sage-devel+unsubscr...@googlegroups.com. To post to t

[sage-devel] Re: git trac try

Thats basically it. The script takes the develop branch and merges in the ticket. And in a "detached head", i.e. without messing up an existing branch. On Thursday, March 9, 2017 at 10:41:07 PM UTC+1, Paul Masson wrote: > > The documentation https://github.com/sagemath/git-trac-command at say >

[sage-devel] Re: git trac try

The documentation https://github.com/sagemath/git-trac-command at say that it creates a detached HEAD merge of the ticket and the develop branch. Since that was written by Volker, perhaps he could provide more information. On Thursday, March 9, 2017 at 1:28:57 AM UTC-8, Eric Gourgoulhon wrote: >

[sage-devel] Re: git trac try

Of course I may dig into git-trac sources, but can anyone tell what "git trac try" does in terms of plain git? Eric. -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails from it, send an email

[sage-devel] Re: git-trac push

no idea why, but now it works (I deleted the branch and checked it out again :-) Martin Am Dienstag, 18. Oktober 2016 08:56:21 UTC+2 schrieb Martin R: > > git-trac doesn't like me - what have I done wrong? > > martin@Martin-Laptop:~/sage-develop$ git-trac push 21594 > Pushing to Trac #21594... >

[sage-devel] Re: git trac push error

Ok, we solved it by a force push. The weird was probably because of french accents in git log error. Julien Le jeudi 25 août 2016 10:06:31 UTC+2, Julien Lavauzelle a écrit : > > Hi, > > I have the following git trac push error: > > Pushing to Trac #20100... > Guessed remote branch: u/jlavauzel

Re: [sage-devel] Re: git trac error

> On Aug 14, 2016, at 21:16 , leif wrote: > > Justin C. Walker wrote: >> >>> On Aug 14, 2016, at 14:06 , Volker Braun wrote: >>> >>> You need the newest git-trac version, presumably you checked out the repo >>> somewhere. Find it and run "git pull (in the git-trac repo folder) >> >> Thanks

[sage-devel] Re: git trac error

Justin C. Walker wrote: > >> On Aug 14, 2016, at 14:06 , Volker Braun wrote: >> >> You need the newest git-trac version, presumably you checked out the repo >> somewhere. Find it and run "git pull (in the git-trac repo folder) > > Thanks for that; the updated git-trac did better. Then I ran in

Re: [sage-devel] Re: git trac error

You need the newest git-trac version, presumably you checked out the repo somewhere. Find it and run "git pull (in the git-trac repo folder) On Sunday, August 14, 2016 at 10:51:36 PM UTC+2, Justin C. Walker wrote: > > > On Aug 14, 2016, at 13:44 , Dima Pasechnik wrote: > > > > > > > On Sunda

Re: [sage-devel] Re: git trac error

On Aug 14, 2016, at 13:44 , Dima Pasechnik wrote: > > > On Sunday, August 14, 2016 at 9:17:27 PM UTC+1, Justin C. Walker wrote: >> >> Hi, all, >> >> I admit to being a total novice in the New World of Sage development >> (post-git). >> > post-git??? Hopefully not... Well, yeah; post-git-

[sage-devel] Re: git trac error

On Sunday, August 14, 2016 at 9:17:27 PM UTC+1, Justin C. Walker wrote: > > Hi, all, > > I admit to being a total novice in the New World of Sage development > (post-git). > post-git??? Hopefully not... You know how to use git, right? Then: http://doc.sagemath.org/html/en/developer/manual_git

Re: [sage-devel] Re: Git repository should have Sage versions as branches not tags

On Tue, Jul 19, 2016 at 10:08 PM, Robert Bradshaw wrote: > I was running a small script on trac.sagemath.org:12000 that was > listening for github pull requests and comments (via github webhooks) > and publishing them to trac (via the trac scripts shipped with Sage). > Nothing too fancy, but I can

Re: [sage-devel] Re: Git repository should have Sage versions as branches not tags

I was running a small script on trac.sagemath.org:12000 that was listening for github pull requests and comments (via github webhooks) and publishing them to trac (via the trac scripts shipped with Sage). Nothing too fancy, but I can't find the code for it at the moment (but it's probably still sit

[sage-devel] Re: Git repository should have Sage versions as branches not tags

Samuel, there are a couple pull requests from the middle of 2015 that never became Trac tickets. The bot appears to have stopped creating tickets before then. There are open pull requests from the end of 2014 that became part of Sage 6.4. The bot does not appear to close pull requests on GitHub

Re: [sage-devel] Re: Git repository should have Sage versions as branches not tags

On Mon, Jul 18, 2016 at 12:46 PM, Thierry wrote: > Hi, > > On Mon, Jul 18, 2016 at 12:17:48PM +0200, Erik Bray wrote: > [...] >> Additionally, I think we should allow issues (without code) to be >> posted on GitHub, and have an easy way to convert a GitHub issue to a >> Trac ticket. I don't think

Re: [sage-devel] Re: Git repository should have Sage versions as branches not tags

Hi, On Mon, Jul 18, 2016 at 12:17:48PM +0200, Erik Bray wrote: [...] > Additionally, I think we should allow issues (without code) to be > posted on GitHub, and have an easy way to convert a GitHub issue to a > Trac ticket. I don't think it should be done for all issues, but > rather use GitHub a

Re: [sage-devel] Re: Git repository should have Sage versions as branches not tags

On Mon, Jul 18, 2016 at 10:12 AM, Samuel Lelievre wrote: > There is a bot (called sageb0t) that turns pull requests on GitHub into trac > tickets. > > It might be that the bot also closes pull requests when the corresponding > tickets > have been closed on trac and a new public release of Sage hap

[sage-devel] Re: Git repository should have Sage versions as branches not tags

There is a bot (called sageb0t) that turns pull requests on GitHub into trac tickets. It might be that the bot also closes pull requests when the corresponding tickets have been closed on trac and a new public release of Sage happens (github pull requests are typically against the master branch

[sage-devel] Re: Git repository should have Sage versions as branches not tags

Don't know, possibly nobody On Sunday, July 17, 2016 at 11:06:37 PM UTC+2, Paul Masson wrote: > > Thanks. > > Another question: who closes Issues and Pull Requests on Github that have > been marked ready for closure? > > On Sunday, July 17, 2016 at 1:56:38 AM UTC-7, Volker Braun wrote: >> >> done

[sage-devel] Re: Git repository should have Sage versions as branches not tags

Thanks. Another question: who closes Issues and Pull Requests on Github that have been marked ready for closure? On Sunday, July 17, 2016 at 1:56:38 AM UTC-7, Volker Braun wrote: > > done > > On Saturday, July 16, 2016 at 11:19:21 PM UTC+2, Paul Masson wrote: >> >> The mirror actually has three

[sage-devel] Re: Git repository should have Sage versions as branches not tags

done On Saturday, July 16, 2016 at 11:19:21 PM UTC+2, Paul Masson wrote: > > The mirror actually has three branches. This one hasn't been touched in > over a year: > > https://github.com/sagemath/sage/tree/module-list-cleanup > > Shouldn't it be removed at some point? > > On Wednesday, July 13, 2

[sage-devel] Re: Git repository should have Sage versions as branches not tags

The mirror actually has three branches. This one hasn't been touched in over a year: https://github.com/sagemath/sage/tree/module-list-cleanup Shouldn't it be removed at some point? On Wednesday, July 13, 2016 at 6:53:21 PM UTC-7, John Phamlore wrote: > > The mirror at > > https://github.com/sa

[sage-devel] Re: Git repository should have Sage versions as branches not tags

Checking out a branch or a tag should be pretty much the same. The only potential pitfall is that you need to quote numbers in yaml, otherwise they are interpreted as numbers. So change branch: develop into e.g. branch: '7.2' On Thursday, July 14, 2016 at 3:53:21 AM UTC+2, John Phamlore wr

[sage-devel] Re: Git repository should have Sage versions as branches not tags

> > However, editing sage.yaml of binary-pkg > > https://github.com/sagemath/binary-pkg > > does not work for tags. > Hmm, somehow I was able to come up with something, though I may be remembering wrong ... anyway, git definitely (so far as I can tell) would discourage a version release being

[sage-devel] Re: Git web interface not displaying file contents

On Tue, Jun 28, 2016 at 6:38 PM, Erik Bray wrote: > On Tue, Jun 28, 2016 at 6:19 PM, Erik Bray wrote: >> Hi all, >> >> As Luca just pointed out to me, and I also noticed on my own earlier >> this morning, the web interface on git.sagemath.org is bugging out and >> not displaying file contents. E

[sage-devel] Re: Git web interface not displaying file contents

On Tue, Jun 28, 2016 at 6:19 PM, Erik Bray wrote: > Hi all, > > As Luca just pointed out to me, and I also noticed on my own earlier > this morning, the web interface on git.sagemath.org is bugging out and > not displaying file contents. E.g.: > https://git.sagemath.org/sage.git/tree/README.md?h=

[sage-devel] Re: "git trac push" can no longer change branch on Trac

Yes thats because the authentication doesn't work right now (see the other thread) On Thursday, June 23, 2016 at 10:27:38 AM UTC+2, Jeroen Demeyer wrote: > > With the latest git-trac-command: > > $ git trac push > Pushing to Trac #20868... > Guessed remote branch: u/jdemeyer/homfly_doctest_

[sage-devel] Re: Git message while pushing a patch

Thank you ! I'll look that up in git's doc. -- Emmanuel Charpentier Le mardi 5 avril 2016 09:39:20 UTC+2, Volker Braun a écrit : > > Pruning is about unreachable objects (commits not referenced by a branch, > e.g. because you deleted the branch). It is safe to do unless you > accidentally dele

[sage-devel] Re: Git message while pushing a patch

Pruning is about unreachable objects (commits not referenced by a branch, e.g. because you deleted the branch). It is safe to do unless you accidentally deleted a branch and want it back ;-) A better command to clean up temporary files is "git gc" which includes pruning On Tuesday, April 5,

[sage-devel] Re: git worktree

> > Has anyone tried it? Getting rid of "I checked out that branch, and it > triggered a 10-minute Sage rebuild" things would be great... > At some point I will get tired of repeating it, but there is absolutely no reason on earth why loading a branch should trigger *any* kind of rebuild excep

[sage-devel] Re: git worktree

Its a neat twist on just making multiple clones of the Sage repo; In terms of rebuild time it doesn't give you really anything different. On Thursday, January 7, 2016 at 12:03:15 AM UTC+1, Dima Pasechnik wrote: > > This is a newish (since git 2.5) feature of git that apparently makes > switchi

[sage-devel] Re: git on xkcd

Also fun: The git man-page generator http://git-man-page-generator.lokaltog.net/ On Saturday, October 31, 2015 at 4:00:39 AM UTC+1, kcrisman wrote: > > http://xkcd.com/1597/ > -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from

[sage-devel] Re: git on xkcd

> > so I guess the optional='internet' hasn't been running yet when people do > tests... > No, it hasn't. So far only the (new style) optional packages are automatically detected and tested. I started (and gave up) an attempt to bring this further: http://trac.sagemath.org/ticket/18904 I

[sage-devel] Re: git trac frustration...

Its because the ticket is closed but not yet released; you can't fetch commits by sha1. It works if you happen to have the commit in your local copy of the trac repo; e.g. run git fetch trac public/ticket/18594 Then afterwards both git fetch trac f257d8224aa79c85a84ced0e69f378fafedbe546 and

[sage-devel] Re: git trac frustration...

Was this every able to get fixed? I'm getting the same problem here on a different ticket aram:/media/ubuntudata/Programming/sage (develop)$ git trac checkout 18594 Loading ticket #18594... Checking out Trac #18594 remote branch f257d8224aa79c85a84ced0e69f378fafedbe546 -> local branch t/18594/f

[sage-devel] Re: git trac asking for password

On Tuesday, 8 September 2015 10:21:32 UTC-7, Mélodie Lapointe wrote: > > Hi, > > I setup correctly my ssh-keys and git trac still ask me for my password. > Also, after asking three times my password, it just fail even if I write > correctly my password. > can you use git without the 'trac' ext

[sage-devel] Re: git trac asking for password

I got my ssh-keys working, but it still strange that it doesn't work with my password. Le mardi 8 septembre 2015 13:21:32 UTC-4, Mélodie Lapointe a écrit : > > Hi, > > I setup correctly my ssh-keys and git trac still ask me for my password. > Also, after asking three times my password, it just f

[sage-devel] Re: git trac asking for password

Hi, I setup correctly my ssh-keys and git trac still ask me for my password. Also, after asking three times my password, it just fail even if I write correctly my password. -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from thi

[sage-devel] Re: git diff wrong?

well, the subject ought to be something like "git trac plugin shows nonsense". On Tuesday, 18 August 2015 15:20:06 UTC-7, Stefan wrote: > > When I click on the green link with the branch name in this ticket, it > makes it look like it deletes the contents of two files: > > http://trac.sagemath.o

Re: [sage-devel] Re: git port blocked

Hi, This is probably caused by the UW firewall. Typically when one requests a change, they make the requested change, then come back a day later and make some *other* non-requested change that totally breaks things. Yep, this is usually what happens. It's kind of weird, and I think what happened

Re: [sage-devel] Re: git port blocked

Also, the https version of trac.sagemath.org does not work. I guess that points to a problem with SSL/TLS El jueves, 23 de julio de 2015, 15:32:02 (UTC+2), Jori Mäntysalo escribió: > > On Thu, 23 Jul 2015, Jan Keitel wrote: > > > Same here: > > jkeitel@pcl337b:~/sage/sage> git pull trac develop

Re: [sage-devel] Re: git port blocked

On Thu, 23 Jul 2015, Jan Keitel wrote: Same here: jkeitel@pcl337b:~/sage/sage> git pull trac develop ssh: connect to host trac.sagemath.org port : Connection timed out fatal: Could not read from remote repository. I am also not able to pull anything, but was able to push few lines of code

[sage-devel] Re: git port blocked

Same here: jkeitel@pcl337b:~/sage/sage> git pull trac develop ssh: connect to host trac.sagemath.org port : Connection timed out fatal: Could not read from remote repository. Am Donnerstag, 23. Juli 2015 13:23:34 UTC+2 schrieb Jeroen Demeyer: > > On my machine, "git fetch" no longer works an

[sage-devel] Re: Git best practice

Hi Travis, On 2015-06-27, Travis Scrimshaw wrote: > In that situation (which I consider as a special case), one should instead > create a new branch based off the point right before the move happened. Actually, after posting, I realised that in the special situation I need the commits (or at l

Re: [sage-devel] Re: Git best practice

> In that situation (which I consider as a special case), one should instead > create a new branch based off the point right before the move happened. Works for me, since the final branch is the same. > Don't change history! You would call it "rewriting history" if, after the merge, you push the

[sage-devel] Re: Git best practice

In that situation (which I consider as a special case), one should instead create a new branch based off the point right before the move happened. Don't change history! Travis On Friday, June 26, 2015 at 12:11:59 PM UTC-7, Nathann Cohen wrote: > >Ah, sorry. From all the different git workf

[sage-devel] Re: Git best practice

> >Ah, sorry. From all the different git workflows I've seen and read, it > is better to push your comments and revert them in later commits because it > shows a history of things you tried (and possibly pull code from). > Once in a branch somebody moved a lot of code from one place to anot

[sage-devel] Re: Git best practice

> If I recall correctly, I found severeal git introductions recommending >> to commit often and early. And how should one possibly show the code to >> a ticket's referee if not by a commit? > > > What I meant was: You should commit often, but you shouldn't import said > commits into other bra

[sage-devel] Re: Git best practice

Hey Simon, Ah, sorry. From all the different git workflows I've seen and read, it is better to push your comments and revert them in later commits because it shows a history of things you tried (and possibly pull code from). Best, Travis On Thursday, June 25, 2015 at 4:52:08 PM UTC-7, Simo

[sage-devel] Re: Git best practice

Hi Volker, On 2015-06-26, Volker Braun wrote: > What I meant was: You should commit often, but you shouldn't import said > commits into other branches if you can avoid it. OK, that makes sense. Thank you. Cheers, Simon -- You received this message because you are subscribed to the Google Gro

[sage-devel] Re: Git best practice

On Friday, June 26, 2015 at 12:45:30 PM UTC+2, Simon King wrote: > > > If in doubt always use the minimal number of commits; There is nothing > to > > be gained by extra stuff in the history that you revert later. > > If I recall correctly, I found severeal git introductions recommending > to c

[sage-devel] Re: Git best practice

Hi Volker, On 2015-06-26, Volker Braun wrote: > The best solution is probably to implement your proof of concept in an > altogether separate ticket. No, it is a proof of concept of one possible interpreation of the ticket's topic, and thus I wouldn't open a new ticket for it. The topic is about

[sage-devel] Re: Git best practice

The best solution is probably to implement your proof of concept in an altogether separate ticket. If in doubt always use the minimal number of commits; There is nothing to be gained by extra stuff in the history that you revert later. On Thursday, June 25, 2015 at 11:07:53 PM UTC+2, Simon Kin

Re: [sage-devel] Re: Git best practice

On 2015-06-26 01:51, Simon King wrote: Which of the two approaches ("Keep the critical commits in and perhaps revert them in a later commit" or "Leave the critical commits out and perhaps insert them later") has the least probability of confusing a referee or upsetting the release manager? Do y

[sage-devel] Re: Git best practice

Hi Travis, On 2015-06-25, Travis Scrimshaw wrote: >You could just make 2 branches, one for each of the commits and > cherry-pick commits between the two branches (or just keep a reference to > the commits you don't want). I know that I can do this. I want to know: What should I push to tra

[sage-devel] Re: Git best practice

Hey Simon, You could just make 2 branches, one for each of the commits and cherry-pick commits between the two branches (or just keep a reference to the commits you don't want). Best, Travis On Thursday, June 25, 2015 at 2:07:53 PM UTC-7, Simon King wrote: > > Hi! > > Trac ticket #18758 d

[sage-devel] Re: git trac frustration...

$ git fetch trac e070dd191bb189b83bae5a2a5c12bf4d70981040 >From trac.sagemath.org:sage * branche070dd191bb189b83bae5a2a5c12bf4d70981040 -> FETCH_HEAD $ echo $? 0 Interesting, I get return code 0. Did it actually fetch anything (ie. FETCH_HEAD is set)? Why didn't it print anything to

[sage-devel] Re: git trac frustration...

Hi, Please consider this question low priority -- I can just directly make the changes to upgrade sage-6.5 to IPython 3 for now, then wait for sage-6.6, which should appear any minute now anyways. That said, shouldn't git fetch trac actually display some sort of error rather than just exiting wit

[sage-devel] Re: git currently unusable on trac?

On Wednesday, April 1, 2015 at 7:01:05 PM UTC+2, Simon King wrote: > > Note that the trouble/confusion would not have happened with mercurial Since you can't rename branches in mercurial, typos stay forever ;-) Seriously, with git you can push any local branch to any remote branch. Just require

[sage-devel] Re: git currently unusable on trac?

Hi Travis, On 2015-04-01, Travis Scrimshaw wrote: > Hey Simon, >You could just do git directly: > > git pull > git push trac local_branch_name:remote_branch_name I can imagine that the problem was as follows: My local branch was pointing to a remote branch in u/SimonKing/..., but the ticket

[sage-devel] Re: git currently unusable on trac?

Hey Simon, You could just do git directly: git pull git push trac local_branch_name:remote_branch_name You could also replace "local_branch_name" with "HEAD" (which pushes whatever your current branch is). If "git pull" doesn't work (I think it should since the branch is linked to the one on

[sage-devel] Re: git currently unusable on trac?

Hi Volker, On 2015-03-31, Volker Braun wrote: > It seems like "git push" fails with an exit code != 0, which you interpret > as working. What is the console output? You can add "git push --verbose" > git push --verbose Versende nach g...@trac.sagemath.org:sage.git Enter passphrase for key '/hom

[sage-devel] Re: git currently unusable on trac?

On Tuesday, March 31, 2015 at 9:17:56 PM UTC+2, Simon King wrote: > > You misunderstood. "git push" did not fail. Instead, "git trac push" > failed It seems like "git push" fails with an exit code != 0, which you interpret as working. What is the console output? You can add "git push --verbose"

  1   2   3   4   >