atom feed11 messages in org.netbeans.broken_builds[broken_builds] Re: push-cnd-main #12...
FromSent OnAttachments
Hudson BuildsMar 24, 2011 9:45 pm 
Jesse GlickMar 25, 2011 6:34 am 
Vladimir Voskresensky - OracleMar 25, 2011 9:17 am 
Jesse GlickMar 25, 2011 9:22 am 
Jesse GlickMar 25, 2011 9:35 am 
Vladimir Voskresensky - OracleMar 25, 2011 10:00 am 
Vladimir VoskresenskyMar 25, 2011 1:21 pm 
Jesse GlickMar 25, 2011 1:37 pm 
Vladimir VoskresenskyMar 26, 2011 4:01 am 
Vladimir VoskresenskyMar 26, 2011 10:22 am 
Jesse GlickMar 26, 2011 9:34 pm 
Subject:[broken_builds] Re: push-cnd-main #12722: Failure
From:Vladimir Voskresensky (vlad@oracle.com)
Date:Mar 26, 2011 4:01:30 am
List:org.netbeans.broken_builds

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.

Thanks, Vladimir.