Opened 10 years ago

Closed 7 years ago

#10988 closed defect (fixed)

Make `sage -upgrade` more developer-friendly by removing merging

Reported by: kini Owned by:
Priority: major Milestone: sage-duplicate/invalid/wontfix
Component: scripts Keywords:
Cc: mderickx, iandrus, jhpalmieri, kcrisman, leif Merged in:
Authors: Reviewers: Jeroen Demeyer
Report Upstream: N/A Work issues:
Branch: Commit:
Dependencies: Stopgaps:

Description (last modified by kini)

sage -upgrade should not forcibly merge the local working directory with upstream files when installing updated SPKGs of the four main tracked repositories of the sage distribution.

It's generally a bad idea because, as I see it, the current workflow of sage development involves using Mercurial mainly 1) to string together patches to make releases, and 2) to create patches to upload to trac. Even if sage -upgrade merges local changes into the tree, those changes will never make it into the main sage distribution unless we dig them out and put them in a patch, which anyway involves unmerging of some sort.

More practically speaking, this merging behavior also currently causes sage -upgrade to fail when attempting to upgrade from one alpha version of sage to another, which is a pain since the sage distribution is both relatively large and slow to build from scratch.

Since alphas are currently released based on the previous stable release rather than the previous alpha, there could also be an option (maybe even a default) to strip the old alpha's branch from the stable version after installing the new alpha, or even automatically rebasing local changes. There is a general procedure I currently follow to move all my patches from old alphas to new alphas which could probably be automated as well.

I marked this as a defect as I think it seems reasonable to expect sage -upgrade to be able to do stuff like this (or at least be usable for upgrading between alphas), but if you disagree, feel free to change it to a feature request.

Change History (11)

comment:1 Changed 10 years ago by iandrus

  • Cc iandrus added

comment:2 Changed 10 years ago by jhpalmieri

  • Cc jhpalmieri added

comment:3 Changed 10 years ago by kini

  • Description modified (diff)
  • Summary changed from Make sage-update more developer-friendly to Make `sage -upgrade` more developer-friendly by removing merging

comment:4 Changed 10 years ago by kcrisman

  • Cc kcrisman added

comment:5 Changed 10 years ago by leif

  • Cc leif added

comment:6 Changed 7 years ago by jdemeyer

  • Milestone changed from sage-5.11 to sage-5.12

comment:7 Changed 7 years ago by iandrus

  • Status changed from new to needs_review

Given the change to git, I think this should probably be closed.

comment:8 follow-up: Changed 7 years ago by kini

Changing to git did not make this go away, oddly. However, this recent commit by vbraun does fix the issue, as far as I can tell.

comment:9 Changed 7 years ago by vbraun_spam

  • Milestone changed from sage-6.1 to sage-6.2

comment:10 in reply to: ↑ 8 Changed 7 years ago by jdemeyer

  • Milestone changed from sage-6.2 to sage-duplicate/invalid/wontfix
  • Reviewers set to Jeroen Demeyer
  • Status changed from needs_review to positive_review

Replying to kini:

Changing to git did not make this go away, oddly. However, this recent commit by vbraun does fix the issue, as far as I can tell.

This commit has been merged now.

comment:11 Changed 7 years ago by vbraun

  • Resolution set to fixed
  • Status changed from positive_review to closed
Note: See TracTickets for help on using tickets.