[sage-devel] Re: checkout for closed tickets which are not yet in develop
Am 2014-11-16 um 12:27 schrieb Volker Braun: On Sunday, November 16, 2014 6:34:56 AM UTC, Clemens Heuberger wrote: Works for me, possibly because I have a newer git. Can it be that it works for you because the commit ec0aae9358f5204a3db6406b2c2f2818a78f5892 (this is the actual commit of #16747) is contained in your local repository? Yes, and I have the commit visible because I ran git remote update trac (and trac is not set up as tracking remote). This pulls down all branches, so in particular it makes the commit visible again. What is our policy concerning deleting branches from the trac repositories (e.g., I usually delete all branches on trac which are merged in a stable release, say, just to unclutter the name space there)? The current workflow (replacing the branch by the commit id when closing the ticket) suggests that the branch could be deleted at that stage; actually, it should only be deleted later (when the ticket is part of a release), because your workflow described above depends on that (well, ok, you do not do git remote update --prune trac). If the merged in field would be set when releasing a develop version, then the replacement of the branch name by the commit id in the ticket could occur at the same time (and not at the time when closing the ticket). Regards, CH -- 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 email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
[sage-devel] Re: checkout for closed tickets which are not yet in develop
What is our policy concerning deleting branches from the trac repositories (e.g., I usually delete all branches on trac which are merged in a stable release, say, just to unclutter the name space there)? The current workflow (replacing the branch by the commit id when closing the ticket) suggests that the branch could be deleted at that stage; actually, it should only be deleted later (when the ticket is part of a release), because your workflow described above depends on that (well, ok, you do not do git remote update --prune trac). If the merged in field would be set when releasing a develop version, then the replacement of the branch name by the commit id in the ticket could occur at the same time (and not at the time when closing the ticket). +1 - but see https://github.com/sagemath/git-trac-command/issues/18 because there might be more technical challenges to making that happen than one thinks. If you have any ideas that can solve Volker's comments about possible problems with this that would be fantastic. - kcrisman -- 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 email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
[sage-devel] Re: checkout for closed tickets which are not yet in develop
On Sunday, November 16, 2014 6:34:56 AM UTC, Clemens Heuberger wrote: Works for me, possibly because I have a newer git. Can it be that it works for you because the commit ec0aae9358f5204a3db6406b2c2f2818a78f5892 (this is the actual commit of #16747) is contained in your local repository? Yes, and I have the commit visible because I ran git remote update trac (and trac is not set up as tracking remote). This pulls down all branches, so in particular it makes the commit visible again. -- 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 email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
[sage-devel] Re: checkout for closed tickets which are not yet in develop
Probably works: git remote update trac git trac checkout 16747 The issue is that git does not let you checkout individual sha1's, they might have been part of a branch that has been removed intentionally (e.g. somebody accidentally checked in their password etc). On Saturday, November 15, 2014 5:52:29 PM UTC, Clemens Heuberger wrote: The release manager recently closed ticket #16747, but it is not yet in develop. In that time window, git trac checkout (or the equivalent git fetch trac commit_id) fails. $ git trac checkout 16747 Checking out Trac #16747 remote branch ec0aae9358f5204a3db6406b2c2f2818a78f5892 - local branch t/16747/ec0aae9358f5204a3db6406b2c2f2818a78f5892... Traceback (most recent call last): ... File /local/cheuberg/git/git-trac-command/git_trac/git_interface.py, line 263, in _run raise GitError(result) git_trac.git_error.GitError: git returned with non-zero exit code (1) when executing git fetch trac ec0aae9358f5204a3db6406b2c2f2818a78f5892 One workaround is to browse the trac ticket, find the last branch name before the release manager replaced the branch field by the commit id and doing a $ git fetch trac u/cheuberg/ticket/16747 The problem does not occur once the ticket in question is in develop. Is there a more comfortable work-around? (The trac remote was configured with $ git remote add -f -t develop -t master trac git:// trac.sagemath.org/sage.git which might be part of the problem). Thanks, CH -- 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 email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
[sage-devel] Re: checkout for closed tickets which are not yet in develop
Am 2014-11-15 um 19:29 schrieb Volker Braun: Works for me, possibly because I have a newer git. $ git --version git version 2.1.3 Can it be that it works for you because the commit ec0aae9358f5204a3db6406b2c2f2818a78f5892 (this is the actual commit of #16747) is contained in your local repository? At least that is the pattern for me: as long as git log -1 ec0aae9358f5204a3db6406b2c2f2818a78f5892 does not return an error, I can do git trac checkout 16747 without problems. Once I get rid of the commit (removed all branches containing it, removed all pertinent entries of the reflog, git gc --prune=all; it was astonishingly difficult to really get rid of it), I cannot fetch it anymore (conforming to the deliberate limitation of git fetch you mentioned earlier). Also, can you keep the messages on the maliinglist since it might be of interest to others. sorry, pressed the wrong buttons yesterday. Thanks for pointing it out. regards, CH. On Sat, Nov 15, 2014 at 6:16 PM, Clemens Heuberger clemens.heuber...@aau.at wrote: Am 2014-11-15 um 19:14 schrieb Volker Braun: Probably works: git remote update trac git trac checkout 16747 unfortunately, does not work (same error message). The issue is that git does not let you checkout individual sha1's, they might have been part of a branch that has been removed intentionally (e.g. somebody accidentally checked in their password etc). -- 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 email to sage-devel@googlegroups.com. Visit this group at http://groups.google.com/group/sage-devel. For more options, visit https://groups.google.com/d/optout.
