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

Uwe Brauer oub at mat.ucm.es
Thu May 25 08:53:32 UTC 2017


   > 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



   > 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.


   > 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.


   > 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




More information about the Mercurial mailing list