Re: Mercurial Hell (xine-lib-1.2)

Hi Petri,
Thanks, I *think* that has worked:
$ hg summary
parent: 12772:02732c69e644 tip
 Fix Mercurial madness.
branch: default
commit: 1 modified, 1 unknown
update: (current)
mq:     (empty queue)

Cheers,Chris

      From: Petri Hintukainen <[email protected]>
 To: [email protected] 
 Sent: Wednesday, 14 December 2016, 22:10
 Subject: Re: [xine-devel] Mercurial Hell (xine-lib-1.2)
   
ke, 2016-12-14 kello 17:33 +0000, Chris Rankin kirjoitti:
> Guys,
> 
> I think my local xine-lib-1.2 repository was in a strange state when
> I committed because it thinks that the parent of change 12770 is
> 12715. And I didn't discover the problem until I'd already "pushed"
> (doh!).
>
> I've managed to update my other copies of this repo using:
> 
> $ hg pull -u
> $ hg update --clean
> 
> But I am open to better suggestions to sort this mess out.

I'm not mercurial expert, so I might be wrong ... But I think you're
missing only one merge commit (and that's why "normal" push failed with
12770).

Looks like there are now two heads (12771 and 12770):

$ hg summary
  parent: 12771:8fb441be475b tip
   Fix build break with DXR3 plugin (v2).
  branch: default
  commit: (clean)
  update: 1 new changesets, 2 branch heads (merge)

You can merge those with

  hg merge && hg commit -m "Merge"

and push the (empty) merge commit.


--- clip

$ hg help push

"By default, push will not allow creation of new heads at the destination, since multiple heads would make it unclear which head to use. In this situation, it is recommended to pull and merge before pushing."

"Note: Extra care should be taken with the -f/--force option, which will push all new heads on all branches, an action which will almost always cause confusion for collaborators."

--- clip


> Cheers,
> Chris
> -------------------------------------------------------------------
> -----------
> Check out the vibrant tech community on one of the world's most 
> engaging tech sites, SlashDot.org! http://sdm.link/slashdot
> _______________________________________________
> xine-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/xine-devel

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most 
engaging tech sites, SlashDot.org! http://sdm.link/slashdot
_______________________________________________
xine-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-devel

------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most 
engaging tech sites, SlashDot.org! http://sdm.link/slashdot

_______________________________________________
xine-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-devel