[tesla-dev] C-state driver draft update - help with hg please

[Li, Aubrey]

Bill.Holler wrote:

> Hi,
> 
> I am unable to "hg import" the cstate.diff file Aubrey sent me.
> Aubrey created this file with "hg export" in his gate which was based
> on changeset 5386:4fccf184d4a7 + his new bits.  This changeset
> 5386 was the cpupm-gate before the 84 merge.
> 
> "hg import" failed to import this changeset into a post-merge
> cpupm-gate.  I assume the "Hunk #1 FAILED at 41" messages
> hg import barfed out are due to a merge conflict???
> 
> I thought it would be easier to import Aubrey's change into a pre-84
> cpupm-gate, and then merge that into the post-84 cpupm-gate.
> I did a "hg clone -r 5386: ..." to get a 5386 changeset.
> "hg log -l 1" in this new clone shows it is the 5386 changeset.
> Aubrey's diff should import without a problem now as there are
> NO merge conflicts.  However import fails with the message below.
> 
> Any suggestions what I should do?  I want to resolve this with
> Mercurial.  However if I cannot figure out how to do this "the hg
> way" soon, I will just hand merge these changes into a 84 based
> cpupm-gate. 

Maybe there is no good way to solve it by hg.
I can submit a new patch based on b84 if you like, :-)

Thanks,
-Aubrey