Need help for a hg push

[Michael Sperber]

Norbert Koch <viteno at xemacs.org> writes:

> * Michael Sperber <sperber at deinprogramm.de>:
>
>> Norbert Koch <viteno at xemacs.org> writes:
>>
>> > * Michael Sperber <sperber at deinprogramm.de>:
>> >
>> >> Could you provide some details?  I assume you're creating a new head,
>> >> but why?  Do you need to pull & merge first?
>> >
>> > This is what hg told me, but pulling does not give me any changes.
>> >
>> > Here's some more information
>> >
>> > ,----[ hg push ]
>> > | ...
>> > | abort: push creates new remote head da9a831ac5eb!
>> > | (did you forget to merge? use push -f to force)
>> > `----
>>
>> What's the output of "hg heads"?
>
> ,----[ hg heads ]
> | changeset:   898:7970bc3d910c
> | tag:         tip
> | parent:      895:d52a886ab3d0
> | user:        Aidan Kehoe <kehoea at parhasard.net>
> | date:        Wed Sep 14 19:39:52 2011 +0100
> | summary:     Update to latest leim.
> | 
> | changeset:   897:da9a831ac5eb
> | user:        Norbert Koch <viteno at xemacs.org>
> | date:        Tue Oct 18 21:58:25 2011 +0200
> | summary:     XEmacs Package Release cc-mode
> `----
>
> I'm getting confused.  I'm pretty sure I've pulled and updated
> everything before I made my changes, simply because I don't want - and
> normally need - to merge.  As Steve has already noted, I'm reacting on
> input from the developers.

You did, but Aidan did not. :-)

-- 
Cheers =8-} Mike
Friede, Völkerverständigung und überhaupt blabla