Re: [sage-devel] sage -upgrade aborts - uncommitted changes

2011-08-25 Thread John H Palmieri
On Thursday, August 25, 2011 6:42:30 PM UTC-7, Kevin Horton wrote: > 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. > Actually, we should ignor

Re: [sage-devel] sage -upgrade aborts - uncommitted changes

2011-08-25 Thread Kevin Horton
On 2011-08-25, at 20:08 , leif wrote: > On 25 Aug., 23:04, John H Palmieri wrote: >> On Thursday, August 25, 2011 9:12:01 AM UTC-7, leif wrote: >> >>> On 25 Aug., 16:51, Jeroen Demeyer wrote: On 2011-08-25 14:40, leif wrote: >> > What I can definitely say is that Sage 4.7.1.rc2's hg c

Re: [sage-devel] sage -upgrade aborts - uncommitted changes

2011-08-24 Thread Kevin Horton
On 2011-08-24, at 13:41 , Maarten Derickx wrote: > Dear Kevin, > > The two commands I gave where intender for RegB who had trouble with the > untrusted hg message sorry for the confusion. > > Well according to your error message sage cannot upgrade since the hg > repository in /Users/kwh/apps

Re: Re: [sage-devel] sage -upgrade aborts - uncommitted changes

2011-08-24 Thread Maarten Derickx
Dear Kevin, The two commands I gave where intender for RegB who had trouble with the untrusted hg message sorry for the confusion. Well according to your error message sage cannot upgrade since the hg repository in /Users/kwh/apps/sage has uncommited changes. But if that doesn't have any chan

Re: Re: [sage-devel] sage -upgrade aborts - uncommitted changes

2011-08-23 Thread Kevin Horton
On 2011-08-23, at 12:10 , Maarten Derickx wrote: > I don't know if you are a developer, but it might be possible that you still > have have queue in one of your repositories. To test this do > >sage -hg qdiff > > in the different repositories. > > Also did you try removing (or beter moving

[sage-devel] sage -upgrade aborts - uncommitted changes

2011-08-22 Thread Kevin Horton
I'm trying to upgrade sage on two boxes from 4.7 to 4.7.1. "sage -upgrade" fails with "There are uncommitted changes in the Sage root repository. Aborting." On one box, "sage -hg diff" found that I had modified SAGE_ROOT, so I undid that. But it still complains about uncommitted changes, even