From owner-freebsd-current@FreeBSD.ORG  Mon May  4 16:44:37 2015
Return-Path: <owner-freebsd-current@FreeBSD.ORG>
Delivered-To: freebsd-current@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 85875FF6;
 Mon,  4 May 2015 16:44:37 +0000 (UTC)
Received: from mail-lb0-x22d.google.com (mail-lb0-x22d.google.com
 [IPv6:2a00:1450:4010:c04::22d])
 (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
 (Client CN "smtp.gmail.com",
 Issuer "Google Internet Authority G2" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 23B80166B;
 Mon,  4 May 2015 16:44:37 +0000 (UTC)
Received: by lbbuc2 with SMTP id uc2so109024262lbb.2;
 Mon, 04 May 2015 09:44:35 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113;
 h=mime-version:sender:in-reply-to:references:date:message-id:subject
 :from:to:cc:content-type;
 bh=JpLCYZCfGsMh23He267aQBpUiBjNIb6L3h/C2SmdeS4=;
 b=Z74lSzTjmvKCQ+AyINqSgIwxEZgI55xGX2pNEdFZm2zYRJaDHkTeubLE8Xk+2gIR0h
 b9qF58ROKwyMURzIOkvlp++TQdlcnfBJO3knt6j7KNEQHgcu3pyUqf96Ya0tclAfLcf0
 E+wf6bTb49RS4BuRJpz5yCZ25R7ziNKdUte1n5VC1cpTKtlBemtmASefy2vlGWHm4rIj
 BsnzQB5OINS4UmQLXhRGTGkbszO+gyBnncXlF8hISNnjZve/tRgiGI5MGHbnSrxYyJGy
 y6U2tIQzXmd+69iwv6UL7wUSz3+Q88D7DTQDosXhW3KtJYuQQaZZii86hrhENmmhbXFV
 U2Eg==
MIME-Version: 1.0
X-Received: by 10.112.220.34 with SMTP id pt2mr20368673lbc.81.1430757875158;
 Mon, 04 May 2015 09:44:35 -0700 (PDT)
Sender: crodr001@gmail.com
Received: by 10.112.164.38 with HTTP; Mon, 4 May 2015 09:44:34 -0700 (PDT)
Received: by 10.112.164.38 with HTTP; Mon, 4 May 2015 09:44:34 -0700 (PDT)
In-Reply-To: <CAB8UbD1-UNkC73C64puNo8oGDm0mgCMogbFRpdCecBwVb_x13g@mail.gmail.com>
References: <861766483.4.1430730824975.JavaMail.jenkins@jenkins-9.freebsd.org>
 <201505041326.t44DQH1E046967@slippy.cwsent.com>
 <CAG=rPVf8a1h+BeKbmd_JDQLve78iyqwAua3kL1SCD=i0eOnuSA@mail.gmail.com>
 <CAB8UbD1-UNkC73C64puNo8oGDm0mgCMogbFRpdCecBwVb_x13g@mail.gmail.com>
Date: Mon, 4 May 2015 12:44:34 -0400
X-Google-Sender-Auth: qy-uQiHbMlgnQgCOQXMTBysPcAQ
Message-ID: <CAG=rPVfPiS8+6FEvMmmXxs-cD6L_78uauw4OP0JDBLJ_eUKZGA@mail.gmail.com>
Subject: Re: Build failed in Jenkins: FreeBSD_HEAD #2725
From: Craig Rodrigues <rodrigc@FreeBSD.org>
To: Cy Schubert <Cy.Schubert@komquats.com>
Cc: freebsd-current Current <freebsd-current@freebsd.org>,
 jenkins-admin@freebsd.org
Content-Type: text/plain; charset=ISO-8859-1
X-Content-Filtered-By: Mailman/MimeDel 2.1.20
X-BeenThere: freebsd-current@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: Discussions about the use of FreeBSD-current
 <freebsd-current.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/freebsd-current>, 
 <mailto:freebsd-current-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/freebsd-current/>
List-Post: <mailto:freebsd-current@freebsd.org>
List-Help: <mailto:freebsd-current-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/freebsd-current>,
 <mailto:freebsd-current-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 04 May 2015 16:44:37 -0000

You need to do a better job at figuring out why you broke things.
This is not the first time you've broken things with an ntp import.

--
Craig
 On May 4, 2015 8:45 AM, "Cy Schubert" <Cy.Schubert@komquats.com> wrote:

> That file was deleted long ago.
>
> Cy Schubert
> <Cy.Schubert@cschubert.com>
> On May 4, 2015 7:49 AM, "Craig Rodrigues" <rodrigc@freebsd.org> wrote:
>
>>
>>
>> On Monday, May 4, 2015, Cy Schubert <Cy.Schubert@komquats.com> wrote:
>>>
>>>
>>> I cannot see where the problem is. All local tests, including universe,
>>> have built cleanly.
>>>
>>
>>  In this log: https://jenkins.freebsd.org/job/FreeBSD_HEAD/2725/console
>> search for:
>>
>> error: version control conflict marker in file
>>
>>
>> --
>>
>> Craig
>>
>>
>>
>>