On 2011-08-25, at 20:08 , leif wrote:
> On 25 Aug., 23:04, John H Palmieri <jhpalmier...@gmail.com> wrote:
>> On Thursday, August 25, 2011 9:12:01 AM UTC-7, leif wrote:
>>
>>> On 25 Aug., 16:51, Jeroen Demeyer <jdem...@cage.ugent.be> wrote:
>>>> On 2011-08-25 14:40, leif wrote:
>>
>>>>> What I can definitely say is that Sage 4.7.1.rc2's hg cannot handle
>>>>> Sage 4.7.2.alpha2's root repo, which *will* break upgrading...
>>
>>>> If this is true, then #10594 needs work!
>>
>>> According to deps, it /should/^TM work
>>
>> I've upgraded 4.7.1 to 4.7.2.alpha2 on two different platforms, with no
>> issues.
>
> Found the "culprit" (for the message; this is from 4.7.rc2's sage-
> update / #9433):
>
> # check sage root repo. if present, check status; if there are
> # any unchecked in changes, abort.
> os.chdir(SAGE_ROOT)
> err = subprocess.call('./sage -hg verify', shell=True,
> stdout=subprocess.PIPE,
> stderr=subprocess.PIPE)
> root_repo_intact = (err == 0)
> if root_repo_intact:
> P = subprocess.Popen('./sage -hg status', shell=True,
> stdout=subprocess.PIPE)
> output = P.communicate()[0]
> if len(output) > 0: # uncommitted changes
> print ("There are uncommitted changes in the "
> + "Sage root repository. Aborting.")
> sys.exit(2)
>
>
> John, is this still current, i.e., do we still need this (especially
> aborting in case there are uncommitted changes)?
>
> Note that len(output)>0 doesn't necessarily mean there are changes
> that should be committed; any file unknown to Mercurial will show up
> there.
Is this a new check in sage 4.7? If so, this almost certainly explains why I
had this abort on my OS X machine, as I have certainly snooped about in the
sage stuff with the Finder, which would litter it with .DS_Store files. These
files would not be known to Mercurial, and could trigger this abort. That
wouldn't have been an issue on my Linux box though.
I suggest that the check for uncommitted changes should be revised to allow
.DS_Store files that are not known to Mercurial on OS X. Perhaps it should
allow any unknown files on any platform.
--
Kevin Horton
Ottawa, Canada
--
To post to this group, send an email to sage-devel@googlegroups.com
To unsubscribe from this group, send an email to
sage-devel+unsubscr...@googlegroups.com
For more options, visit this group at http://groups.google.com/group/sage-devel
URL: http://www.sagemath.org
