disappearing divergence state?
Matt Harbison
mharbison72 at gmail.com
Tue Jan 5 02:42:59 UTC 2016
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
changeset: 28449:a90528e0296e
user: Matt Harbison <matt_harbison at yahoo.com>
date: Wed Dec 16 17:17:36 2015 -0500
summary: test-default-push: make `pwd` URL compatible on Windows
changeset: 28450:5b5faa5397f1
user: Matt Harbison <matt_harbison at yahoo.com>
date: Wed Dec 16 17:22:37 2015 -0500
summary: test-check-py3: convert directory separators to '/' for MSYS
More information about the Mercurial-devel
mailing list