W3C home > Mailing lists > Public > public-rdf-wg@w3.org > October 2013

RE: New edit of RDF Semantics. (was: Re: Unable to make changes using Mercurial)

From: Markus Lanthaler <markus.lanthaler@gmx.net>
Date: Thu, 24 Oct 2013 19:46:23 +0200
To: "'Pat Hayes'" <phayes@ihmc.us>
Cc: "'RDF WG'" <public-rdf-wg@w3.org>
Message-ID: <00e801ced0e0$f5a3af80$e0eb0e80$@lanthaler@gmx.net>
On Thursday, October 24, 2013 7:24 PM, Pat Hayes wrote:
> Yes, many thanks to you and Robin for find this, and all those bugs are
> now fixed, at least in my local copy. BUT now I am back stuck unable to
> push my changes, because
> 
> "hg push --new-branch default
> warning: dvcs.w3.org certificate with fingerprint
> 97:4c:0e:c5:2e:95:74:5e:c7:fa:ed:07:3f:97:ab:ea:80:7a:be:7c not
> verified (check hostfingerprints or web.cacerts config setting)
> abort: push creates new remote head 0122b0cefba2!
> (you should pull and merge or use push -f to force)
> pushing to https://dvcs.w3.org/hg/rdf/
> searching for changes
> Completed with errors, see above"
> 
> What the hell is it talking about?? None of this makes the slightest
> sense. What does it mean, I should pull? I am working on the SAME FILE.
> Nobody else is making any changes to it. What am I supposed to be
> merging it with??

Well, I did. Remember, I fixed the reference. So before you start doing some
work, you should always do a

hg pull
hg update

 
> I only just made a completely new Repository LAST NIGHT. Do I have to
> do that all again? And re-do my edits on the new copy, all over again??

You can try to do a merge

hg pull -u
hg merge

and then committing the changes

hg commit



--
Markus Lanthaler
@markuslanthaler
Received on Thursday, 24 October 2013 17:46:57 UTC

This archive was generated by hypermail 2.4.0 : Friday, 17 January 2020 17:04:33 UTC