W3C home > Mailing lists > Public > public-css-testsuite@w3.org > December 2014

Issue of hg-commit changes and hg-merge

From: Zhang, Zhiqiang <zhiqiang.zhang@intel.com>
Date: Tue, 30 Dec 2014 08:56:46 +0000
To: Gérard Talbot <css21testsuite@gtalbot.org>, "Linss, Peter" <peter.linss@hp.com>
CC: fantasai <fantasai.lists@inkedblade.net>, "?? ? (Shiozawa, Hajime)" <hajime.shiozawa@gmail.com>, Public CSS test suite mailing list <public-css-testsuite@w3.org>, Koji Ishii <kojiishi@gluesoft.co.jp>
Message-ID: <0EA8FB2070816C499E0A50AC1B0B5C160170465D@SHSMSX101.ccr.corp.intel.com>
> From: Gérard Talbot [mailto:css21testsuite@gtalbot.org]
> Sent: Tuesday, December 30, 2014 16:47

[snip]

> By the way, I'm having a nightmare trying to hg-commit changes and
> hg-merge ... .
> 
> $ hg heads
> 
> changeset:   6950:f88446e28ffa
> bookmark:    master
> tag:         tip
> parent:      6948:14f7e0e9696e
> parent:      6949:8aee821a731a
> user:        Zhiqiang Zhang
> date:        Tue Dec 30 14:15:28 2014 +0800
> summary:     Merge pull request #654 from zqzhang/remove-color-archive
> 
> changeset:   6945:cab2042eb775
> user:        Gérard Talbot
> date:        Tue Dec 30 01:13:21 2014 -0500
> summary:     1- inline-replaced-wm-rl-003.xht was filename-renamed

I just merged 2 pull requests after someone reviewed them at

https://github.com/w3c/csswg-test/pull/653

https://github.com/w3c/csswg-test/pull/654


Is this a problem of github-hg sync, Peter?

Thanks,
Zhiqiang
Received on Tuesday, 30 December 2014 08:57:34 UTC

This archive was generated by hypermail 2.3.1 : Tuesday, 6 January 2015 21:13:27 UTC