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

Robert, thanks for your help.

I tried updating to the latest version of mercurial, but 'hg pull --rebase'
is not recognized as a valid option - any ideas?

% hg --version
Mercurial Distributed SCM (version 2.1+20120201)
(see http://mercurial.selenic.com for more information)

Copyright (C) 2005-2012 Matt Mackall and others
This is free software; see the source for copying conditions. There is NO
warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

% hg pull --rebase
hg pull: option --rebase not recognized
hg pull [-u] [-f] [-r REV]... [-e CMD] [--remotecmd CMD] [SOURCE]

pull changes from the specified source

options:

 -u --update                update to new branch head if changesets were
                            pulled
 -f --force                 run even when remote repository is unrelated
 -r --rev REV [+]           a remote changeset intended to be added
 -B --bookmark BOOKMARK [+] bookmark to pull
 -b --branch BRANCH [+]     a specific branch you would like to pull
 -e --ssh CMD               specify ssh command to use
    --remotecmd CMD         specify hg command to run on the remote side
    --insecure              do not verify server certificate (ignoring
                            web.cacerts config)

[+] marked option can be specified multiple times

use "hg help pull" to show the full help text



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