Data corruption local rep, bitbucket repo has more heads than local one?

[Matt Harbison]

On Thu, 25 May 2017 04:53:32 -0400, Uwe Brauer <oub at mat.ucm.es> wrote:

>
>    > On Wed, 24 May 2017 03:59:46 -0400, Uwe Brauer <oub at mat.ucm.es>  
> wrote:
>
>    > Doing you have anything incoming in this local repo? What does `hg
>    > log --hidden -r 921b9b8667b1` say?
>
> changeset:   78:921b9b8667b1
> user:        Uwe Brauer  <oub at mat.ucm.es>
> date:        Tue May 23 16:14:53 2017 +0000
> summary:     Correct H_0 en P4/H6

Sorry, I've lost the context at this point.  If you drop the --hidden arg  
and run the same command in the same repo, nothing shows, right?  That  
tells me you've obsoleted this commit, but for some reason, the obsolete  
markers aren't making it to the other repo(s).  Bitbucket supports evolve,  
doesn't it?  If you push from your first repo to the one with all the  
heads, I assume the extra heads go away?

>
>    > Does `hg log -T phases` say that 921b9b8667b1 and fc056d395e04 are
>    > public?
>
> Do you mean in the clone one where I see the heads, right?
>
> No,  none is public,  all are drafts.

Correct.  This also points to a lack of obsolete markers.

>
>    > If so, does forcing them to draft make them disappear? (I'm
>    > assuming that you were experimenting with evolve from a couple weeks
>    > ago.) Note that if they do disappear, you will have to figure out  
> how
>    > to set them to draft on bitbucket, and any clones you made from it.
>    > (You will have a similar issue with them coming back on pull if you
>    > strip them.)
>
> I think in order to avoid conflicts with my collaborators (I am not sure
> what will happen if they pull now (that is why I told them to wait)), I
> will delete and recreate the repo and push from my local one, without
> these strange heads. History will not be the same, but that can't be  
> helped.
>
>    > You shouldn't have gotten multiple heads on the server like this,
>    > unless you are using -f when you push.
>
>
> This is precisely what bothers me, how the hell did this happened.

You may want to enable the internal blackbox extension, which tries to  
keep a log of the things going on in your repo.

>
>    > Any idea what the differences between the 3 commits are?
>
> There are difference but it is cumbersome to figure them out.
>
>
> Thanks for your help
>
> _______________________________________________
> Mercurial mailing list
> Mercurial at mercurial-scm.org
> https://www.mercurial-scm.org/mailman/listinfo/mercurial