477093 - "Linux mozilla-1.9.1 build" tinderbox fails with message "build/nsprpub/configure: line 6114: syntax error near unexpected token `<<<'"

Status: RESOLVED FIXED

(Release Engineering :: General, defect)

Description

[Daniel Holbert [:dholbert]]

The Linux mozilla-1.9.1 build machine just failed, on what looks like a merge error from the "patch" command:

/builds/moz2_slave/mozilla-1.9.1-linux/build/nsprpub/configure: line 6114: syntax error near unexpected token `<<<'
/builds/moz2_slave/mozilla-1.9.1-linux/build/nsprpub/configure: line 6114: `<<<<<<< /builds/moz2_slave/mozilla-1.9.1-linux/build/nsprpub/configure'
configure: error: /builds/moz2_slave/mozilla-1.9.1-linux/build/nsprpub/configure failed for nsprpub
*** Fix above errors and then restart with               "make -f client.mk build"

This is oddly sporadic -- the previous cycle was green, and the only changeset between the two is this one:
  http://hg.mozilla.org/releases/mozilla-1.9.1/rev/89a76e45e282
which just touches this windows-only installer code: 
  browser/installer/windows/nsis/uninstaller.nsi
  toolkit/mozapps/installer/windows/nsis/common.nsh

Chris Atlee just looked over some recent tinderbox logs, and he says this has happened on this machine a number of times before.

Comment 1

[Chris AtLee [:catlee]]

This looks like a bad merge, maybe from hg?  It's hard to tell at this point, since it happened before Feb 1st and I can't find logs going back before that to indicate what the cause of the problem could have been.

I've reverted configure on this machine (moz2-linux-slave08), so future builds on this machine should go through.

We should probably be using 'hg update -C' to prevent this sort of problem.  I've filed #477095 for this.