Re: [sage-devel] git question/request

2023-03-29 Thread Matthias Koeppe
Update in https://github.com/sagemath/sage/pull/35384 On Wednesday, March 29, 2023 at 1:45:41 PM UTC-7 Dima Pasechnik wrote: > well, good luck developing with such remotes :-) > > On Wed, 29 Mar 2023, 21:41 Matthias Koeppe, wrote: > >> On Wednesday, March 29, 2023 at 1:10:27 PM UTC-7 Dima Pasech

Re: [sage-devel] git question/request

2023-03-29 Thread Dima Pasechnik
well, good luck developing with such remotes :-) On Wed, 29 Mar 2023, 21:41 Matthias Koeppe, wrote: > On Wednesday, March 29, 2023 at 1:10:27 PM UTC-7 Dima Pasechnik wrote: > > that's a bit unusual for tarballs to pack .git/ > subdirectory. I think it just should not be there. > > > > It is plac

Re: [sage-devel] git question/request

2023-03-29 Thread Matthias Koeppe
On Wednesday, March 29, 2023 at 1:10:27 PM UTC-7 Dima Pasechnik wrote: that's a bit unusual for tarballs to pack .git/ subdirectory. I think it just should not be there. It is placed there deliberately so that users can start development directly from an unpacked tarball. -- You received t

Re: [sage-devel] git question/request

2023-03-29 Thread Dima Pasechnik
On Wed, 29 Mar 2023, 18:32 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/sagemath/sagetrac-mirror.git (fetch) > tra

[sage-devel] git question/request

2023-03-29 Thread John H Palmieri
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/sagemath/sagetrac-mirror.git (fetch) trac ssh://g...@trac.sagemath.org:/sage.git (push) Should this

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

2020-10-28 Thread 'Peter Mueller' via sage-devel
I'm sorry if the following is more appropriate for sage-support. 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 code, namely sag

Re: [sage-devel] git status keeps saying modified: build/pkgs/cunningham_tables/main.gz

2020-07-30 Thread Dima Pasechnik
On Thu, Jul 30, 2020 at 9:31 AM Sébastien Labbé wrote: > > > > On Thursday, July 30, 2020 at 10:12:10 AM UTC+2, Dima Pasechnik wrote: >> >> On Thu, Jul 30, 2020 at 8:37 AM Sébastien Labbé wrote: >> > >> > Dear sage-devel, >> > >> > When I update my sage version, I never do a fresh clone. I always

Re: [sage-devel] git status keeps saying modified: build/pkgs/cunningham_tables/main.gz

2020-07-30 Thread Sébastien Labbé
On Thursday, July 30, 2020 at 10:12:10 AM UTC+2, Dima Pasechnik wrote: > > On Thu, Jul 30, 2020 at 8:37 AM Sébastien Labbé > wrote: > > > > Dear sage-devel, > > > > When I update my sage version, I never do a fresh clone. I always pull > the most recent develop branch. Everything always wor

Re: [sage-devel] git status keeps saying modified: build/pkgs/cunningham_tables/main.gz

2020-07-30 Thread Dima Pasechnik
On Thu, Jul 30, 2020 at 8:37 AM Sébastien Labbé wrote: > > Dear sage-devel, > > When I update my sage version, I never do a fresh clone. I always pull the > most recent develop branch. Everything always work. > > But now, my git status keeps telling me that > build/pkgs/cunningham_tables/main.gz

[sage-devel] git status keeps saying modified: build/pkgs/cunningham_tables/main.gz

2020-07-30 Thread Sébastien Labbé
Dear sage-devel, When I update my sage version, I never do a fresh clone. I always pull the most recent develop branch. Everything always work. But now, my git status keeps telling me that build/pkgs/cunningham_tables/main.gz is modified and I found no way to get rid of that (git checkout buil

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

2018-11-29 Thread Emmanuel Charpentier
Trying to test Trac#26791 : charpent@zen-book-flip:/usr/local/sage-8$ git trac checkout 26791 Loading ticket #26791... Checking out Trac #26791 remote branch u/gh-timokau/rpy2-build-typo -> local branch t/26791/rpy2-build-typo... Traceback (most recent ca

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

2018-11-29 Thread Dima Pasechnik
Use plain git. Suppose you're on branch called foo git fetch trac u/gh-timokau/rpy2-build-typo git checkout -b rpy2-build-typo FETCH_HEAD at this point you have created a local branch called rpy2-build-typo which is more or less what trac extension is supposed to do. Test is, and then do git che

[sage-devel] git fetch fails

2018-10-21 Thread Jeroen Demeyer
Any ideas? error: cannot lock ref 'refs/remotes/trac/u/embray/python3/sage-rings-polynomial-polydict/misc': 'refs/remotes/trac/u/embray/python3/sage-rings-polynomial-polydict' exists; cannot create 'refs/remotes/trac/u/embray/python3/sage-rings-polynomial-polydict/misc' From trac.sagemath.org

[sage-devel] Git push issues

2018-03-06 Thread Meghana.M Reddy
Hi, I am new to sage and fairly new to git too. I am working on implementing an algorithm in Sage and I followed all the doc pages for setting up git trac. I have created a new ticket for the algorithm I implemented and would like to push my local branch to this ticket. The git trac push #TICKET

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

2017-09-12 Thread Dima Pasechnik
On Tuesday, September 12, 2017 at 3:28:06 PM UTC+1, vdelecroix wrote: > > There is already > > git://github.com/sagemath/sage.git > this is not a full mirror of trac's git repo. > > On 12/09/2017 13:26, Dima Pasechnik wrote: > > A mirror on github is up (see another message here), enjoy...

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

2017-09-12 Thread Clemens Heuberger
Am 2017-09-12 um 16:28 schrieb Vincent Delecroix: > So it seems that the git server does not longer accept read only requests > without ssh authentication... I confirm that: on one and the same machine: $ LANG=C git fetch git://trac.sagemath.org/sage.git fatal: read error: Connection reset by pee

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

2017-09-12 Thread Vincent Delecroix
On 12/09/2017 16:26, Vincent Delecroix wrote: On 12/09/2017 12:58, Daniel Krenn wrote: On 2017-09-12 12:49, Daniel Krenn wrote: On 2017-09-12 12:04, 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_out

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

2017-09-12 Thread Vincent Delecroix
There is already git://github.com/sagemath/sage.git On 12/09/2017 13:26, Dima Pasechnik wrote: A mirror on github is up (see another message here), enjoy... https://github.com/dimpase/sagetrac-mirror On Tuesday, September 12, 2017 at 12:05:53 PM UTC+1, Dima Pasechnik wrote: basically same re

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

2017-09-12 Thread Vincent Delecroix
On 12/09/2017 12:58, Daniel Krenn wrote: On 2017-09-12 12:49, Daniel Krenn wrote: On 2017-09-12 12:04, 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: Co

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

2017-09-12 Thread Dima Pasechnik
A mirror on github is up (see another message here), enjoy... https://github.com/dimpase/sagetrac-mirror On Tuesday, September 12, 2017 at 12:05:53 PM UTC+1, Dima Pasechnik wrote: > > basically same remote setup for me, and it still works fine; > We can set up a github mirror, perhaps... > > On T

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

2017-09-12 Thread Dima Pasechnik
basically same remote setup for me, and it still works fine; We can set up a github mirror, perhaps... On Tuesday, September 12, 2017 at 11:58:57 AM UTC+1, Daniel Krenn wrote: > > On 2017-09-12 12:49, Daniel Krenn wrote: > > On 2017-09-12 12:04, Frédéric Chapoton wrote: > >> I have access failu

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

2017-09-12 Thread Daniel Krenn
On 2017-09-12 12:49, Daniel Krenn wrote: > On 2017-09-12 12:04, 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é-initialisée par le c

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

2017-09-12 Thread Daniel Krenn
On 2017-09-12 12:04, 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é-initialisée par le correspondant > > Does anybody else suffers fro

[sage-devel] git trac is down ?

2017-09-12 Thread Frédéric Chapoton
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é-initialisée par le correspondant Does anybody else suffers from that ? Frederic -- You received this message because y

[sage-devel] git trac try

2017-03-08 Thread Paul Masson
For those of you like me who didn't know about this, git trac try is a fast way to review tickets without having to build older versions. git trac try automatically merges the current develop branch with only the changes on a ticket into a temporary branch. If you've already built the current d

Re: [sage-devel] Git : need help with Trac#22189 : I can't solve a merge conflict with 7.6beta1

2017-01-31 Thread Erik Bray
On Tue, Jan 31, 2017 at 3:54 PM, Emmanuel Charpentier wrote: > Dear list, > > I proposed Trac#22189 to (start to) solve our OpenSSL conundrum. This patch > was originally one commit. At the suggestion of a reviewer,, I added a > second patch, changing the target Sage version. This second patch, so

[sage-devel] Git : need help with Trac#22189 : I can't solve a merge conflict with 7.6beta1

2017-01-31 Thread Emmanuel Charpentier
Dear list, I proposed Trac#22189 to (start to) solve our OpenSSL conundrum. This patch was originally one commit. At the suggestion of a reviewer,, I added a second patch, changing the target Sage version. This second patch, somehow, conflicted with 7.6.

Re: [sage-devel] git-trac push

2016-10-18 Thread Volker Braun
On Tuesday, October 18, 2016 at 10:37:24 AM UTC+2, Daniel Krenn wrote: > > It would be nice, if the actual git errors were shown by git-trac. Is > this (easily) possible? > Doing "git-trac --log=DEBUG" probably works. Of course the ideal solution would be for main to catch errors and present a

Re: [sage-devel] git-trac push

2016-10-18 Thread Daniel Krenn
On 2016-10-18 08:56, 'Martin R' via sage-devel wrote: > martin@Martin-Laptop:~/sage-develop$ git-trac push 21594 > Pushing to Trac #21594... > Guessed remote branch: u/mantepse/growth_diagrams > Traceback (most recent call last): > ... > raise GitError(result) > git_trac.git_error.GitError It

[sage-devel] git-trac push

2016-10-17 Thread 'Martin R' via sage-devel
git-trac doesn't like me - what have I done wrong? martin@Martin-Laptop:~/sage-develop$ git-trac push 21594 Pushing to Trac #21594... Guessed remote branch: u/mantepse/growth_diagrams Traceback (most recent call last): File "/home/martin/git-trac-command/bin/git-trac", line 18, in cmdline.l

Re: [sage-devel] git fetch warning about /home/erik_m_bray

2016-10-05 Thread Daniel Krenn
On 2016-10-05 17:12, Erik Bray wrote: > On Wed, Oct 5, 2016 at 4:58 PM, Erik Bray wrote: >> On Wed, Oct 5, 2016 at 12:26 PM, Jeroen Demeyer >> wrote: >>> When running "git fetch", I get >>> >>> remote: warning: unable to access >>> '/home/erik_m_bray/.config/git/attributes': Permission denied >>

Re: [sage-devel] git fetch warning about /home/erik_m_bray

2016-10-05 Thread Erik Bray
On Wed, Oct 5, 2016 at 5:12 PM, Erik Bray wrote: > On Wed, Oct 5, 2016 at 4:58 PM, Erik Bray wrote: >> On Wed, Oct 5, 2016 at 12:26 PM, Jeroen Demeyer >> wrote: >>> When running "git fetch", I get >>> >>> remote: warning: unable to access >>> '/home/erik_m_bray/.config/git/attributes': Permissi

Re: [sage-devel] git fetch warning about /home/erik_m_bray

2016-10-05 Thread Erik Bray
On Wed, Oct 5, 2016 at 4:58 PM, Erik Bray wrote: > On Wed, Oct 5, 2016 at 12:26 PM, Jeroen Demeyer > wrote: >> When running "git fetch", I get >> >> remote: warning: unable to access >> '/home/erik_m_bray/.config/git/attributes': Permission denied > > Confirmed--this is only for git:// too. I w

Re: [sage-devel] git fetch warning about /home/erik_m_bray

2016-10-05 Thread Erik Bray
On Wed, Oct 5, 2016 at 12:26 PM, Jeroen Demeyer wrote: > When running "git fetch", I get > > remote: warning: unable to access > '/home/erik_m_bray/.config/git/attributes': Permission denied Confirmed--this is only for git:// too. I was the last person to restart git-daemon on the server. But I

Re: [sage-devel] git fetch warning about /home/erik_m_bray

2016-10-05 Thread Daniel Krenn
On 2016-10-05 12:26, Jeroen Demeyer wrote: > When running "git fetch", I get > > remote: warning: unable to access > '/home/erik_m_bray/.config/git/attributes': Permission denied I get the same. (posted at https://groups.google.com/d/msg/sage-release/gPJzDIKgkbM/vpmw872OCQAJ) -- You received t

[sage-devel] git fetch warning about /home/erik_m_bray

2016-10-05 Thread Jeroen Demeyer
When running "git fetch", I get remote: warning: unable to access '/home/erik_m_bray/.config/git/attributes': Permission denied -- 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, se

[sage-devel] git trac push error

2016-08-25 Thread Julien Lavauzelle
Hi, I have the following git trac push error: Pushing to Trac #20100... Guessed remote branch: u/jlavauzelle/cyclic_code Traceback (most recent call last): File "/usr/local/bin/git-trac", line 18, in cmdline.launch() File "/usr/local/lib/python2.7/dist-packages/git_trac/cmdline.py", line

Re: [sage-devel] git trac error

2016-08-14 Thread Justin C. Walker
> 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 into this, which perhaps has to do

[sage-devel] git trac error

2016-08-14 Thread Justin C. Walker
Hi, all, I admit to being a total novice in the New World of Sage development (post-git). Using OS X, 10.11.6, I attempted just now to “git” the code from a trac ticket (which has every indication of being more-or-less up-to-date, git-wise), and got this in response (on a freshly-built 7.3): %

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

2016-07-13 Thread John Phamlore
The mirror at https://github.com/sagemath/sage has only two branches, develop and master. Versions seem to be kept as tags. However, editing sage.yaml of binary-pkg https://github.com/sagemath/binary-pkg does not work for tags. -- You received this message because you are subscribed to the

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

2016-06-28 Thread Erik Bray
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=develop Curiously it shows the correct number of line numbers

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

2016-06-23 Thread Jeroen Demeyer
With the latest git-trac-command: $ git trac push Pushing to Trac #20868... Guessed remote branch: u/jdemeyer/homfly_doctest_errors The authenticity of host 'trac.sagemath.org (104.197.143.230)' can't be established. ECDSA key fingerprint is 5b:97:c8:74:a6:c4:e4:55:d1:13:8a:84:a3:85:25:6f. Are

[sage-devel] Git message while pushing a patch

2016-04-05 Thread Emmanuel Charpentier
Pushing to Trac#20190 , I got : charpent@asus16-ec:/usr/local/sage-exp$ git trac push Pushing to Trac #20190... Guessed remote branch: u/charpent/upgrade_r_to_3_2_4 remote: Trac #20190: Commit changed to feb037. Auto packing the repository for optim

[sage-devel] git worktree

2016-01-06 Thread Dima Pasechnik
This is a newish (since git 2.5) feature of git that apparently makes switching between different branches very quick. https://git-scm.com/docs/git-worktree I imagine it is diskspace-hungry, but, OK, this should only be big deal on VMs... Has anyone tried it? Getting rid of "I checked out that b

[sage-devel] git trac timeout

2015-12-08 Thread John Cremona
I am getting timeouts from g...@trac.sagemath.org -- is it just me? John -- 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.

[sage-devel] git on xkcd

2015-10-30 Thread kcrisman
Reasons we should have stuck with hg: http://xkcd.com/1597/ sage: xkcd(1597) Githttp://imgs.xkcd.com/comics/git.png"; title="If that doesn't fix it, git.txt contains the phone number of a friend of mine who understands git. Just wait through a few minutes of 'It's really pretty simple, just thi

Re: [sage-devel] git diff wrong?

2015-08-20 Thread Jeroen Demeyer
On 2015-08-18 23:20, Stefan wrote: Can I give something like this positive review, in spite of the trac website messing things up? Yes, the git Trac plugin is known to sometimes give wrong diffs. What matters is what the command-line git says. Jeroen. -- You received this message because yo

[sage-devel] git diff wrong?

2015-08-18 Thread Stefan
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.org/ticket/18946 When I "git trac try 18946" and then do a diff against the previous commit, everything is fine (i.e. the new code gets added, not

Re: [sage-devel] git port blocked

2015-07-23 Thread William Stein
It should be fixed now. On Thursday, July 23, 2015, mmarco wrote: > 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 w

[sage-devel] git port blocked

2015-07-23 Thread Jeroen Demeyer
On my machine, "git fetch" no longer works and the problem looks to be that the git port is firewalled: $ git fetch fatal: unable to connect to trac.sagemath.org: trac.sagemath.org[0: 128.208.160.253]: errno=Connection timed out $ strace git fetch [...] connect(34, {sa_family=AF_INET, sin_port

[sage-devel] Git best practice

2015-06-25 Thread Simon King
Hi! Trac ticket #18758 depends on #18756. The former has no branch yet, the latter has a branch, but it is not clear to me whether the last two commits will actually make it into the final version (it is a proof of concept, but one may argue if it is a good idea). So, the question is: What should

[sage-devel] git trac frustration...

2015-04-06 Thread William Stein
I took a not-so clean Sage-6.5 install, installed git-trac (with no keys or login/password) and tried to check out the code from ticket 17826 (upgrade Ipython). I just get some mysterious errors.How am I supposed to debug this? salvus@devel1dc5:/usr/local/sage/current$ git trac checkout 17826

[sage-devel] git currently unusable on trac?

2015-03-31 Thread Simon King
Hi! I tried to post two new commits on #16453. "git trac push" failed with the following traceback: > git trac push Pushing to Trac #16453... Guessed remote branch: public/ticket/16453 Enter passphrase for key '/home/king/.ssh/id_rsa': Traceback (most recent call last): File "/home/king/bin/g

Re: [sage-devel] 'git trac' instructions for rebasing/merging

2015-03-13 Thread Volker Braun
On Friday, March 13, 2015 at 6:10:09 PM UTC+1, Jonas Jermann wrote: > > At the moment the git history of sage looks quite messy > and I assume it will get worse, not better. It doesn't get messier over time, its more of a steady state. You either make the history more difficult to understand,

Re: [sage-devel] 'git trac' instructions for rebasing/merging

2015-03-13 Thread Jonas Jermann
Hi On 12.03.2015 08:28, Nathann Cohen wrote: Hello everybody, I just noticed that we do not seem to have in our developer's manual instructions about how to rebase/merge a branch when it becomes incompatible with the latest beta. I do not use 'git trac' myself, but it would be cool if anybody

[sage-devel] 'git trac' instructions for rebasing/merging

2015-03-12 Thread Nathann Cohen
Hello everybody, I just noticed that we do not seem to have in our developer's manual instructions about how to rebase/merge a branch when it becomes incompatible with the latest beta. I do not use 'git trac' myself, but it would be cool if anybody who does could add such an entry in the develope

Re: [sage-devel] git upgrade?

2015-02-06 Thread Francois Bissey
On 7/02/2015, at 17:09, kcrisman wrote: > > From the Github team, this mention: > > Don't forget: an important Git security vulnerability was fixed last > December. If you haven't upgraded your Git client since then, we recommend > that you do so as soon as possible. The new release, 2.3.0, in

[sage-devel] git upgrade?

2015-02-06 Thread kcrisman
>From the Github team, this mention: Don't forget: an important Git security vulnerability was fixed last December. If you haven't upgraded your Git client since then, we recommend that you do so as soon as possible. The new release, 2.3.0, includes the security fix, as do the maintenance relea

[sage-devel] git trac push error

2015-01-25 Thread Jeroen Demeyer
I get the following error and I have no idea what's going wrong: $ git trac push Pushing to Trac #17583... Guessed remote branch: u/jdemeyer/ticket/17583 Traceback (most recent call last): File "/home/jdemeyer/local/bin/git-trac", line 18, in cmdline.launch() File "/home/jdemeyer/local/s

[sage-devel] git-pretty

2015-01-06 Thread John Cremona
http://justinhileman.info/article/git-pretty/ -- 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 this group, send

[sage-devel] git server

2014-12-13 Thread Samuel Lelièvre
Hello, just wondering if the git server is having problems or undergoing a strong load? It took me three attempts to fetch from it. It worked at the third attempt. (See below). Vincent Delecroix had the same problem just before that. Samuel $ git fetch trac u/vdelecroix/flat_surfaces-6.5.beta2 ss

Re: [sage-devel] git config --global push.default matching/simple ?

2014-11-20 Thread Ralf Hemmecke
http://www.lmgtfy.com/?q=git+config+global+push.default+simple&l=1 On 11/20/2014 09:04 PM, John Cremona wrote: > On 20 November 2014 17:24, Dima Pasechnik wrote: >> with new git, one has new default behavour of git push. Namely, you can >> choose >> git config --global push.default matching >> or

Re: [sage-devel] git config --global push.default matching/simple ?

2014-11-20 Thread John Cremona
On 20 November 2014 17:24, Dima Pasechnik wrote: > with new git, one has new default behavour of git push. Namely, you can > choose > git config --global push.default matching > or > git config --global push.default simple > > Which one should one choose for Sage workflow? > (sorry for possibly du

[sage-devel] git config --global push.default matching/simple ?

2014-11-20 Thread Dima Pasechnik
with new git, one has new default behavour of git push. Namely, you can choose git config --global push.default matching or git config --global push.default simple Which one should one choose for Sage workflow? (sorry for possibly dumb question). Dima -- You received this message because you

Re: [sage-devel] Git weirdness ?

2014-11-05 Thread Vincent Delecroix
2014-11-05 12:37 UTC−06:00, Emmanuel Charpentier : > > > Le mercredi 5 novembre 2014 19:15:27 UTC+1, vdelecroix a écrit : >> >> What is the point of doing git fetch followed by git pull ? > > > Seemed to be the mos treamlined to keep my tree up to date... > git pull should be enough. >> Note that

Re: [sage-devel] Git weirdness ?

2014-11-05 Thread Emmanuel Charpentier
Le mercredi 5 novembre 2014 19:15:27 UTC+1, vdelecroix a écrit : > > What is the point of doing git fetch followed by git pull ? Seemed to be the mos treamlined to keep my tree up to date... > Note that > with git fetch (or git pull) you download *all* the remote branches on > the trac ser

Re: [sage-devel] Git weirdness ?

2014-11-05 Thread Vincent Delecroix
What is the point of doing git fetch followed by git pull ? Note that with git fetch (or git pull) you download *all* the remote branches on the trac server while you seemed only interested to pull the develop branch. You should have done git pull trac develop where trac is the name you choose

[sage-devel] Git weirdness ?

2014-11-05 Thread Emmanuel Charpentier
Trying to update a sage tree (currently at 6.4rc0) : charpent@SAP5057241:/usr/local/sage-6.4$ git status Sur la branche develop Votre branche est à jour avec 'trac/develop'. rien à valider, la copie de travail est propre charpent@SAP5057241:/usr/local/sage-6.4$ git fetch remote: Counting objects: 2

[sage-devel] git trac asking for password

2014-10-26 Thread Volker Braun
The password prompt is from git, it can't find the ssh key to authenticate and falls back to password. Make sure you have the right ssh key, see the developer manual for details. -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe fro

[sage-devel] git trac asking for password

2014-10-26 Thread Amit Jamadagni
Hello everyone, I have setup the git-trac-enable using the source enable.sh and also have set the username and password using git trac config --user USERNAME --pass ''. It prompts me to give in a password ~/sage$ git trac push 17030 Pushing to Trac #17030... Guessed remote branch: u/a

[sage-devel] git trac log

2014-09-09 Thread Clemens Heuberger
I get (git-trac-command at 7e8fb34) $ git trac log 16538 Error: release manager has not merged Trac #16538 $ git trac log 16943 Error: release manager has not merged Trac #16943 $ git trac log 16786 Error: release manager has not merged Trac #16786 Actually, #16538 has been merged in 6.4.beta0, #

[sage-devel] git-trac guessing remote branch skips one letter

2014-07-23 Thread Daniel Krenn
I was working on krenn@brown:/local/data/krenn/sage/current6$ git branch --contains * article-fsm-in-sage and then wanted to push it on trac by: krenn@brown:/local/data/krenn/sage/current6$ git-trac push 16705 Pushing to Trac #16705... Guessed remote branch: u/dkrenn/rticle-fsm-in-sage

[sage-devel] git trac

2014-06-14 Thread William Stein
Hi Sage Devel, Sage comes with git, but Sage doesn't come with "git trac". Why not? Is it just that nobody got around to including it, or is this on purpose. http://www.sagemath.org/doc/developer/git_trac.html#installing-the-git-trac-command I'm just getting annoyed, due to copying the command

[sage-devel] git-trac trouble

2014-06-03 Thread Stefan
Hi all, I'm trying to follow the developer's guide to set up git-trac. I keep running into the following error, for instance when checking out a ticket or setting up my username and password: Saved trac username. Saved trac password. Trac xmlrpc URL: http://trac.sagemath.org/xmlrpc (anonymo

Re: [sage-devel] git diff branch1..develop

2014-05-01 Thread Vincent Delecroix
2014-05-01 13:00 UTC+02:00, Martin Albrecht : > Hi all, > > currently it is a bit awkward to review a branch on trac which has many > commits. For example > >http://trac.sagemath.org/ticket/15976 > > has quite a few commits so it seems quite daunting to review it, whereas the > > actual differe

[sage-devel] git diff branch1..develop

2014-05-01 Thread Martin Albrecht
Hi all, currently it is a bit awkward to review a branch on trac which has many commits. For example http://trac.sagemath.org/ticket/15976 has quite a few commits so it seems quite daunting to review it, whereas the actual difference to the main development branch is not that much. Locally,

[sage-devel] git merge: good practice

2014-04-23 Thread Vincent Delecroix
Hi, I was working on a ticket on my local branch X based on an old Sage version. Let say that my develop is up to date and my HEAD is currently at develop. I want to merge X to be up to date and see two ways to do this 1) {{{ git checkout X git merge develop }}} 2) {{{ git checkout -b Y git merg

Re: [sage-devel] Git (and "git trac") in the developer guide heads up

2014-04-06 Thread William Stein
On Sun, Apr 6, 2014 at 2:17 PM, Volker Braun wrote: > I'm changing the developer guide to push people towards git + my "git trac" > subcommand instead of the "sage -dev" scripts. Nothing actually changes as > far as functionality goes, you can still use the dev scripts or just 100% > plain git. A

[sage-devel] Git (and "git trac") in the developer guide heads up

2014-04-06 Thread Volker Braun
I'm changing the developer guide to push people towards git + my "git trac" subcommand instead of the "sage -dev" scripts. Nothing actually changes as far as functionality goes, you can still use the dev scripts or just 100% plain git. As Karl-Dieter pointed out, the updated developer guide no

[sage-devel] git-annex (was: Git reviewing help needed)

2014-01-24 Thread Marc Mezzarobba
R. Andrew Ohana wrote: > The Sage repository should not contain binary files nor non-sage > specific source code, so naturally cloning the sage repository would > not include compressed tarballs of upstream code. Just an idea, but what you you think of embedding pointers to the tarballs via git-a

[sage-devel] Git reviewing help needed

2014-01-09 Thread Stefan
Hi all, In my quest to review some of Nathann's tickets, I keep hitting walls. This is part of the commit graph for ticket 15285: * commit 8468131a81898d5a3ccfb38d9f1a3d44df15fe10 |\ Merge: 2750b79 6f247f6 | | Author: Nathann Cohen | | Date: Tue Jan 7 09:34:46 2014 +0100 | | | | trac #

Re: [sage-devel] "git trac" command

2013-12-29 Thread anne1 . schilling
On Thursday, December 26, 2013 5:12:13 PM UTC-8, R. Andrew Ohana wrote: > > On Wed, Dec 25, 2013 at 12:36 PM, Volker Braun > > > wrote: > > I've been working on a "git trac" subcommand to complement the git suite >> with trac integration instead of the separate UI that the sage -dev scripts >

Re: [sage-devel] "git trac" command

2013-12-29 Thread John Cremona
I vote for making this an extension to git, as it makes interacting with trac easier while also allowing developers to learn git if they did not already know it. If we think about the previous development process using mercurial, I am pretty sure that very few people used the sage-wrapped function

Re: [sage-devel] "git trac" command

2013-12-28 Thread Volker Braun
I've been taking some bits and pieces from the sage -dev scripts, so its not entirely unrelated. Mostly, there is a philosophical difference: The dev scripts implement an alterative UI to git, and the git trac command extends git. The arguments for it aren't exactly new, and boil down to * A lo

Re: [sage-devel] "git trac" command

2013-12-28 Thread Nathann Cohen
Yo ! > What's the relation between this and ./sage -dev? Because I don't think we should have this "git trac" command and also "./sage -dev" with lots of overlapping functionality. So I would vote for Jeroen, let me tell you that I *LOVE* the way you rewrite the questions. > [X] Inte

Re: [sage-devel] "git trac" command

2013-12-28 Thread Jeroen Demeyer
On 2013-12-25 21:36, Volker Braun wrote: I've been working on a "git trac" subcommand to complement the git suite with trac integration instead of the separate UI that the sage -dev scripts present. This project is the basis for my release management scripts, so I have been eating my own dog food

Re: [sage-devel] "git trac" command

2013-12-27 Thread Volker Braun
I agree that it shoud be installed separately, though of course we want to make it easy for people to try it out. But just running "sage -f git_trac" ought to be easy enough, so lets go with that. And the current branch is not set to build by default anyways. So as soon as somebody presses the

Re: [sage-devel] "git trac" command

2013-12-26 Thread R. Andrew Ohana
On Wed, Dec 25, 2013 at 12:36 PM, Volker Braun wrote: I've been working on a "git trac" subcommand to complement the git suite > with trac integration instead of the separate UI that the sage -dev scripts > present. This project is the basis for my release management scripts, so I > have been eati

[sage-devel] "git trac" command

2013-12-25 Thread Volker Braun
I've been working on a "git trac" subcommand to complement the git suite with trac integration instead of the separate UI that the sage -dev scripts present. This project is the basis for my release management scripts, so I have been eating my own dog food for a while now. I think it is now in a

[sage-devel] git workflow with trac?

2013-11-05 Thread Ralf Hemmecke
Bold question... does Sage still need Trac? Has someone already compared all options for a workflow with git? Sage-Trac vs. Github pull-requests with comments vs. Gerrit vs. ... https://help.github.com/articles/using-pull-requests http://alblue.bandlem.com/2011/02/gerrit-git-review-with-jenkins-

Re: [sage-devel] git and patchbot

2013-08-30 Thread Volker Braun
On Friday, August 30, 2013 8:48:04 AM UTC+1, Marc Mezzarobba wrote: > Would git ls-remote be suitable? > That just gives you the current branch head. In that case you can just fetch the branch and use whatever the current branch head is. This is probably what should happen if the "Commit" trac

Re: [sage-devel] git and patchbot

2013-08-30 Thread Robert Bradshaw
Oh, one more prerequisite: we need to populate the commit field on trac (preferably automatically) so the patchbot can tell when a commit gets out of date. Alternatively, perhaps there's a way to query the commit a branch points to via http without having to fetch it? - Robert On Thu, Aug 29, 2

Re: [sage-devel] git and patchbot

2013-08-29 Thread Robert Bradshaw
No. It's mostly done; I set out to finish it up just a couple of days ago (but ran into a bunch of other issues trying to figure out what branch to build, merge into, and the fact that tests didn't even all pass in the git branch). Actually being able to pull, build, and pass tests is a prerequisit

[sage-devel] git and patchbot

2013-08-29 Thread Frédéric Chapoton
Hello, so far, the patchbot is not able to test the tickets given by a git branch (and it seems that it does not recognize the branch field) Would it be hard to get that working ? There are already several tickets with a git branch waiting for review (just one example #15054) Frederic -- You

[sage-devel] git transition timetable

2013-04-22 Thread John Cremona
Could someone report on where the transition to git has reached and when it will happen (or give a link to somewhere this is recorded)? It seems to me from postings to this group that this will be soon enough that it is not worth showing a new potential developer how to use Mercurial, queues and a

Re: [sage-devel] GIT + release management

2013-03-31 Thread Harald Schilly
On Saturday, March 30, 2013 9:04:36 AM UTC+1, Snark wrote: > > Let me use that occasion to thank you publicly and loudly about your > work managing releases! > absolutely! thank's for all the fantastic management and congratulations to your astonishing skills herding all those tickets and dev

Re: [sage-devel] GIT + release management

2013-03-31 Thread Charles Bouillaguet
On Mar 31, 2013, at 11:49 AM, Martin Albrecht wrote: > Indeed +1 Completely +1 --- Charles Bouillaguet http://www.lifl.fr/~bouillaguet/ -- You received this message because you are subscribed to the Google Groups "sage-devel" group. To unsubscribe from this group and stop receiving emails fro

Re: Re: [sage-devel] GIT + release management

2013-03-31 Thread Martin Albrecht
Indeed +1 On Saturday 30 Mar 2013, Julien Puydt wrote: > Le 30/03/2013 06:00, Jeroen Demeyer a écrit : > > Sage 5.1x will also be the last release under my release management. The > > switch to GIT is an excellent time for a new release manager, since the > > release workflow will change substanti

Re: [sage-devel] GIT + release management

2013-03-30 Thread Julien Puydt
Le 30/03/2013 06:00, Jeroen Demeyer a écrit : Sage 5.1x will also be the last release under my release management. The switch to GIT is an excellent time for a new release manager, since the release workflow will change substantially anyway. Robert Bradshaw has agreed to be release manager for Sa

[sage-devel] GIT + release management

2013-03-29 Thread Jeroen Demeyer
Dear Sage lovers, I'm here at the Sage-GIT workshop and it's very clear that the switch to GIT is happening. The current idea is to have Sage 5.9 and Sage 5.10 with the current Mercurial-based workflow. Hopefully before Sage 5.10, there will already be a usable GIT-based release in parallel

  1   2   >