Pushing subrepos containing obsolescence markers

[Ludovic Chabant]

Hello everyone,

I had an issue that I solved while writing this message (rubber duck
solving[1]!), but I figured I would still post it since I didn't find
much information out there about it, so it may be useful for someone.

I have a repo with subrepos. One of those subrepos is the evolve
extension repo ("mutable-history") from marmoute, which I have never
touched (the repo, not marmoute). Now, things are going to be a bit
vague because I don't exactly remember how this all happened, but I
think it went something along the following lines:

* I saw on the wiki[2] a new, more official, repo URL (netv6.net), so I
pulled from that one on one of my computers in that mutable-history
subrepo. There was no diff with marmoute's personal repo so I left it at
that.
* Did some work, pushed the master repo to my file server.
* I went onto another computer, pulled from my file server master repo.
* Did some work, try to push.

The situation I ended up with is that I had no changes in the
mutable-history repo, but the obsolescence markers were different -- I
assume it was a byproduct of pulling from different actual repos. That
seems to be enough for Mercurial to want to push to it, but of course, I
don't want to (and even if I did, I don't have permission to):

pushing to Z:\SCM\Hg\DotFiles
no changes made to subrepo lib\hg\allpaths since last push to
https://bitbucket.org/ludovicchabant/allpaths
no changes made to subrepo lib\hg\hg-git since last push to
https://bitbucket.org/durin42/hg-git
no changes made to subrepo lib\hg\hg-prompt since last push to
https://bitbucket.org/sjl/hg-prompt
no changes made to subrepo lib\hg\mercurial-cli-templates since last
push to https://bitbucket.org/sjl/mercurial-cli-templates
pushing subrepo lib\hg\mutable-history to
https://bitbucket.org/marmoute/mutable-history
searching for changes
no changes found
pushing 5583 obsolescence markers in 129 pushkey payload (844062 bytes)
http authorization required for
https://bitbucket.org/marmoute/mutable-history
realm: Bitbucket.org HTTP
user: interrupted!


I eventually remembered this whole marmoute vs. netv6.net business and
made my .hgsub point to the netv6.net URL instead. This time it pushed
OK.


[1]: https://en.wikipedia.org/wiki/Rubber_duck_debugging
[2]: https://www.mercurial-scm.org/wiki/EvolveExtension
-- 
 l u d o .
 . 8 0 17 80