#13015: Metaticket: revamp workflow / switch to git
-------------------------------------+-------------------------------------
Reporter: kini | Owner: jason
Type: task | Status: new
Priority: major | Milestone: sage-6.0
Component: misc | Resolution:
Keywords: git workflow, | Merged in:
sd51 | Reviewers:
Authors: | Work issues:
Report Upstream: N/A | Commit:
Branch: public/sage- | b890215d378b8cdcd960bceeb79f4cdc849b8d66
git/master | Stopgaps:
Dependencies: #14480, #14481, |
#14482, #14330, #14273, #14954, |
#14962 |
-------------------------------------+-------------------------------------
Changes (by git):
* commit: d8713eb90042a1e879cf8e8999f3ab8a40f1e292 =>
b890215d378b8cdcd960bceeb79f4cdc849b8d66
Comment:
Branch pushed to git repo; I updated commit sha1. New commits:
||[changeset:b890215]||Merge branch 'ticket/14482' into public/sage-
git/master||
||[changeset:6bb1502]||Fixing doctests and adding some coverage||
||[changeset:90d7a64]||Fix some doctest problems||
||[changeset:393d8bb]||Fix a bug in unstash||
||[changeset:4281985]||Merge branch 'u/saraedum/ticket/14482' of
ssh://trac.sagemath.org:2222/sage into ticket/14482||
||[changeset:1183a8b]||Fixing doctest errors, adding functions for
changing status of tickets, making e-mail notifications happen||
||[changeset:348e0a0]||"dependencies" is not a valid name for a branch
since this is a special keyword for merge().||
||[changeset:e793b41]||Implemented 'dependencies' in merge()||
||[changeset:9569608]||Several trivial doctest fixes in sage dev
scripts.||
||[changeset:fa96127]||Delete dependencies when abandoning a ticket.||
||[changeset:736295c]||Stashes were printed twice by unstash()||
||[changeset:7191281]||Merge branch 'u/roed/ticket/14482' of
ssh://trac.sagemath.org:2222/sage into ticket/14482||
||[changeset:d7b6620]||Changed the default behaviour for merge() with
respect to remote branches.||
||[changeset:cfc472d]||Fixed _is_remote_branch_name when exists!=None.||
||[changeset:c0648c7]||Update documentation of import_patch and
download_patch||
||[changeset:b38fe65]||Merge branch 'stash/1' into ticket/14482||
||[changeset:8b48c3c]||Fix some typos||
||[changeset:aa642da]||Merge branch 'u/saraedum/ticket/14482' of
ssh://trac.sagemath.org:2222/sage into ticket/14482||
||[changeset:4aebcfa]||Changes stashed by
reset_to_clean_working_directory()||
||[changeset:fdaa995]||More error checking on ticket edits, add a
set_attributes function||
||[changeset:51c04ac]||Use --work-tree in git_interface.||
||[changeset:a36c492]||Fixed an optional internet doctest in sagedev.||
||[changeset:38636b0]||Fix typo in unstash||
||[changeset:4828a9a]||Revert "Make sure we do not touch files outside of
sage in the dev scripts."||
||[changeset:ae2fde5]||Fixed edit_ticket().||
||[changeset:03cd3fd]||Fixed import_patch()||
||[changeset:15d9e77]||Fixing typos, making small changes||
||[changeset:9e3a961]||Fixed a question in import_patch()||
||[changeset:0b04731]||Fixed a typo in import_patch()||
||[changeset:a625996]||Fixed a typo in import_patch()||
||[changeset:f63d614]||Removed a reference to /dev/shm/ from sagedev.py||
||[changeset:167fe88]||Moved hg patch related methods to patch.py||
||[changeset:76b09f0]||Make download_patch and import_patch download and
apply patches like the patchbot does.||
||[changeset:73410f3]||Fixed two typos in docstrings/comments||
||[changeset:6061772]||fixed a TracConnectionError() call||
||[changeset:f95ece6]||Fixed two optional: internet tests||
||[changeset:6df1b96]||Merge branch 'u/roed/ticket/14482' of
ssh://trac.sagemath.org:2222/sage into ticket/14482||
||[changeset:4072ade]||download() did not behave as advertised in the
docstring||
||[changeset:5f85692]||Fixed an incorrect help string in upload()||
||[changeset:453486f]||Fixed an incorrect help string in download()||
||[changeset:979fcd4]||Merge branch 'u/saraedum/ticket/14482' of
ssh://trac.sagemath.org:2222/sage into ticket/14482||
||[changeset:c575cca]||Added capability to view ticket info and comments
via dev scripts||
||[changeset:8052e27]||Make sure we do not touch files outside of sage in
the dev scripts.||
||[changeset:f43d853]||Corrected the _src directory in the git interface||
||[changeset:6b64c54]||switch_ticket()/create_ticket() works with an
unclean working directory in some cases.||
||[changeset:4275bbd]||Fixed doctests if no user.name and user.email had
been set in git||
||[changeset:e078628]||Add a warning in upload() to not erase
dependencies.||
||[changeset:51e2179]||merge() fails when merging a ticket into itself||
||[changeset:ed8ed9d]||Fixed an infinite recursion in download_patch().||
||[changeset:0f30605]||Fixed a doctest for download_patch()||
||[changeset:d9d7fe4]||Merge branch 'stash/1' into ticket/14482||
||[changeset:7c934d2]||Changes stashed by
reset_to_clean_working_directory()||
||[changeset:debc6ed]||Added a doctest to sagedev which shows how to start
afresh when working on a ticket.||
||[changeset:c68940a]||Delete branch -> ticket association when
abandon()ing a branch in sagedev.||
||[changeset:bc5ce5a]||Moved much of the code of create_ticket() to
switch_ticket()||
||[changeset:2167665]||Make user interface for sagedev more tolerant.||
||[changeset:859987e]||Forbid None, True, False as branch names||
||[changeset:7b0a041]||Fall back to http if ssl is not available||
||[changeset:07dfcef]||Be more verbose about whether a commit has been
created or not in sagedev||
||[changeset:b8c78f2]||Hide git debug messages per default in sagedev.||
||[changeset:1ba2a7a]||fixed a typo in sagedev.py||
||[changeset:a9c8a91]||Merge branch 'build_system' into dev_scripts||
||[changeset:5adc4a4]||Store the data of the SavingDicts of SageDev in
.git||
||[changeset:957a415]||Small fix to legacy support for SavingDicts in
SageDev||
||[changeset:8b0d31e]||Fixed a doctest in trac_interface.py||
||[changeset:b8dccf1]||SavingDicts for SageDev are now stored in the
working tree||
||[changeset:c66bdfd]||fixed two problems in SageDev.commit()||
||[changeset:a773f54]||Merge branch 'build_system' into ticket/14482||
--
Ticket URL: <http://trac.sagemath.org/ticket/13015#comment:25>
Sage <http://www.sagemath.org>
Sage: Creating a Viable Open Source Alternative to Magma, Maple, Mathematica,
and MATLAB
--
You received this message because you are subscribed to the Google Groups
"sage-trac" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To post to this group, send email to [email protected].
Visit this group at http://groups.google.com/group/sage-trac.
For more options, visit https://groups.google.com/groups/opt_out.
