W3C home > Mailing lists > Public > public-rdf-wg@w3.org > May 2011

Re: Preparing editor's drafts -- Q's for the team contacts

From: Dan Brickley <danbri@danbri.org>
Date: Wed, 25 May 2011 16:14:44 +0300
Message-ID: <BANLkTik1+KEBTxFtj1-9jA78gChXg2DE5g@mail.gmail.com>
To: "Eric Prud'hommeaux" <eric@w3.org>
Cc: Richard Cyganiak <richard@cyganiak.de>, Ivan Herman <ivan@w3.org>, RDF Working Group WG <public-rdf-wg@w3.org>
On 25 May 2011 15:59, Eric Prud'hommeaux <eric@w3.org> wrote:
> * Eric Prud'hommeaux <eric@w3.org> [2011-05-25 08:43-0400]

> In case someone later recalls this thread to see how to assure mercurial that conflicts are resolved, the somewhat opaque command is "hg resolve --mark". (This should really show up in the "can't commit with unresolved conflicts" error message. Mercurial's feature of remembering conflicts is probably useful, but has inspired some serious tearing out of hair in the past.
>

I've added this to http://www.w3.org/2006/tools/wiki/Mercurial ... and
encourage others who figure out any annoying details / tricks to
record things in that wiki too. You can log in with your standard W3C
account, no need for extra registrations, so it only takes a few
seconds to paste in some text or a useful link.

cheers,

Dan
Received on Wednesday, 25 May 2011 13:15:15 GMT

This archive was generated by hypermail 2.3.1 : Tuesday, 26 March 2013 16:25:43 GMT