disappearing divergence state?

[Matt Mackall]

On Mon, 2016-01-04 at 21:42 -0500, Matt Harbison wrote:
> I'm not sure what is going on here, so I thought I solicit debugging ideas.
> 
> Based on timestamp and the lack of a corresponding email CC'd to my inbox,  
> I must have used pushgate to submit this series.  I haven't noticed an  
> issue with pushgate before though.
> 
>      https://selenic.com/pipermail/mercurial-devel/2015-December/076969.html
> 
> When I got back to work and pulled today, the successors were in the  
> transfer, and these 3 commits were marked "unstable, divergent".  The thg  
> graph didn't give any clues about successors, so I tried `hg debugobsolete  
> $orig_node`.  It cranked away for a few seconds, and exited without  
> printing anything.  At that point, I noticed that $orig_node was now  
> changed to "obsolete", and no longer divergent or unstable.  `hg log -r  
> divergent()` printed the remaining 2 nodes, so this wasn't a transient or  
> thg issue.
> 
> Any idea what is going on here?  I have the latest default, and evolve  
> should be no more than 3 weeks old or so.  I repeated `hg debugobsolete`  
> on the second commit, and the same thing happened.  Therefore, there's one  
> left to experiment on (I suppose I could backup obsstore, anything else?)
> 
>  From what I can tell, there is no actual divergence.  Locally, the  
> affected commits are:
> 
> $ hg log -r 28448::
> changeset:   28448:980d61134536
> user:        Matt Harbison <matt_harbison at yahoo.com>
> date:        Wed Dec 16 13:33:43 2015 -0500
> summary:     windows: correct the import of win32

Locally, I've got:

$ hg log -r "91225 or 223e" --hidden
changeset:   33152:912255f8f087
user:        Matt Harbison <matt_harbison at yahoo.com>
date:        Wed Dec 16 13:33:43 2015 -0500
summary:     windows: correct the import of win32

changeset:   33145:223e8c7fc637
user:        Matt Harbison <matt_harbison at yahoo.com>
date:        Wed Dec 16 13:33:43 2015 -0500
summary:     windows: correct the import of win32

..where the first one is public and the second one is obsolete.

I don't have a marker for your 980d hash, but it seems correct that it's
obsolete given that a public version of it exists.

-- 
Mathematics is the supreme nostalgia of our time.