[sage-devel] Re: Sage 3.2.2.alpha1 released!

[daveloeffler]

On Dec 11, 12:26 pm, mabshoff <[EMAIL PROTECTED]> wrote:
> You likely have two heads, i.e. you need to do a merge. That is why it
> is highly recommended to upgrade from a clean branch. "hg heads"
> should tell you if you have more than one head and "hg merge tip"
> should get you all the changes committed. Either way, for future
> upgrades I would that you start with a clean branch and then upgrade
> that.

Oops. Sorry. Mea culpa. I usually don't change sage-main for exactly
this reason, but in this instance I had (accidentally) made a tiny
change in main rather than in one of my working branches, and hg quite
rightly didn't merge. Thanks for the diagnosis.

David


--~--~---------~--~----~------------~-------~--~----~
To post to this group, send email to sage-devel@googlegroups.com
To unsubscribe from this group, send email to [EMAIL PROTECTED]
For more options, visit this group at http://groups.google.com/group/sage-devel
URLs: http://www.sagemath.org
-~----------~----~----~----~------~----~------~--~---