W3C home > Mailing lists > Public > public-grddl-wg@w3.org > February 2007

Re: Sets of related test cases (hg admin)

From: Dan Connolly <connolly@w3.org>
Date: Tue, 20 Feb 2007 22:29:55 -0600
Message-ID: <45DBCAC3.4050708@w3.org>
To: "Clark, John" <CLARKJ2@ccf.org>
Cc: public-grddl-wg <public-grddl-wg@w3.org>
Clark, John wrote:
>> [I]t seems your work 
>> doesn't include the DEBUG factoring Chime did, so I applied 
>> your patch against the 6d7d38577f3e version, resulting in
>>   http://homer.w3.org:8000/?cs=97f71f8cc60e
>>
>> We now have two heads that should be merged; this one and the 
>> one resulting from Chime's DEBUG factoring work.
>>   http://homer.w3.org:8000/?cs=8a5bc100babf
>>     
>
> Using the new server URLs, I did a merge of these heads; the patch
> should be attached to this email.
>   
Hmm... I applied it and pushed it,
  http://homer.w3.org/~connolly/projects/grddl-client/rev/f84769498215

But the other head is still there.
 http://homer.w3.org/~connolly/projects/grddl-client/rev/8a5bc100babf

And when I try to 'hg merge', I get conflicts. Maybe we can just
discard/ignore the 8a5bc100babf head/branch. I dunno. oh well.

-- 
Dan Connolly, W3C http://www.w3.org/People/Connolly/
Received on Wednesday, 21 February 2007 04:30:01 GMT

This archive was generated by hypermail 2.2.0+W3C-0.50 : Tuesday, 8 January 2008 14:11:47 GMT