On 03/25/2011 11:38 PM, Jesse Glick wrote:
On 03/25/2011 04:21 PM, Vladimir Voskresensky wrote:
we still have merge conflict.
Not as such; rather the script is trying to merge with an ancestor,
which is a no-op in Hg.
Is it the same root cause
I don't know. Was this build pulling from a successful team repo build
in which you had pushed the manual merge with main-silver?
I pushed my merge (based on your steps) into cnd-main and cnd-main on
bertram is successful.
Any hints how to resolve the issue?
Fixes of some HR bugs are only in cnd-main => QA can not verify official
dev build, because changes are not propagated.