W3C home > Mailing lists > Public > public-audio@w3.org > January to March 2012

Re: latest version of the "Web Audio API" draft ?

From: Chris Rogers <crogers@google.com>
Date: Mon, 6 Feb 2012 11:47:20 -0800
Message-ID: <CA+EzO0kagp0GU3w+uLVogPVABCog25h9pM87Mt6P__dfQJUUgQ@mail.gmail.com>
To: robert@ocallahan.org
Cc: public-audio@w3.org, Thierry Michel <tmichel@w3.org>
Thanks again Rob,

I've now fixed up my .hgrc file as you suggest, so now "rebase" is
recognized.  But, I still don't seem to be able to 'hg push'.
I'm reluctant to use 'hg push -f' :

% hg pull --rebase
pulling from https://dvcs.w3.org/hg/audio
searching for changes
no changes found
% hg pull -u
pulling from https://dvcs.w3.org/hg/audio
searching for changes
no changes found
% hg push
pushing to https://dvcs.w3.org/hg/audio
searching for changes
abort: push creates new remote head ab7733f6ce3a!
(did you forget to merge? use push -f to force)
% hg status
? .emacs.desktop


Thanks,
Chris


On Mon, Feb 6, 2012 at 10:58 AM, Robert O'Callahan <robert@ocallahan.org>wrote:

> On Tue, Feb 7, 2012 at 7:00 AM, Thierry Michel <tmichel@w3.org> wrote:
>
>> > Hi Thierry, yes that is the correct link.
>> >
>> > But, I have just updated the spec locally with some refinements, and am
>> > having trouble pushing my changes to your server.  I believe something
>> > might have changed in the 'hg' configuration when Robert O'Callahan
>> added
>> > his spec in his sister directory.  Here is the error message I'm getting
>> > when I try to push:
>> >
>> > % hg push
>> >
>> > pushing to https://dvcs.w3.org/hg/audio
>> > searching for changes
>> > abort: push creates new remote heads on branch 'default'!
>> > (did you forget to merge? use push -f to force)
>> >
>> > In fact, if I go to this link:
>> > https://dvcs.w3.org/hg/audio/
>> >
>> > Then I only can see the mercurial change history from Robert's changes,
>> > with no record of my previous commits.
>> >
>> > I'd love to be able to commit my latest changes, but am stuck at this
>> > point...
>>
>
> That just means you made local commits that you didn't push, and meanwhile
> I pushed my own commits. This is completely normal when multiple people are
> contributing. There are two easy ways to resolve it.
> 1) "hg pull --rebase" to pull my commits into your local repository and
> rebase your local commits on top of mine. That should work fine since there
> should not be any conflicts. You will then be able to push normally. This
> is the easiest.
> 2) "hg pull -u" to pull in my commits, giving you two separate branches
> locally. Then merge the branches together using "hg merge" and push the
> result.
>
> The hg documentation is very readable and well worth a read.
> http://hgbook.red-bean.com/
>
> Rob
> --
> "If we claim to be without sin, we deceive ourselves and the truth is not
> in us. If we confess our sins, he is faithful and just and will forgive us
> our sins and purify us from all unrighteousness. If we claim we have not
> sinned, we make him out to be a liar and his word is not in us." [1 John
> 1:8-10]
>
Received on Monday, 6 February 2012 19:47:51 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Monday, 6 February 2012 19:47:52 GMT