From owner-freebsd-current@FreeBSD.ORG Mon May 4 17:38:01 2015 Return-Path: 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 C123885F; Mon, 4 May 2015 17:38:01 +0000 (UTC) Received: from mail-pa0-x233.google.com (mail-pa0-x233.google.com [IPv6:2607:f8b0:400e:c03::233]) (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 8E5031C7B; Mon, 4 May 2015 17:38:01 +0000 (UTC) Received: by pabtp1 with SMTP id tp1so166623350pab.2; Mon, 04 May 2015 10:38:01 -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=jSpR3m4/n4XeQCWcshG1dL2HmGJfkrgEOqvncPPCQhY=; b=YqUpYK1MZw5vNOCJOy9HZFGbYwHoe+sFzvY0454vt4SuJQG31pcfgTnS+BDJsh4i90 GFhmsY/Sl5um4PgX4t/KdOlARb4bLPIxzbZNn4+EHBZ4EOxHDwZ2R4e0v7p3nYKpiHjO tQ16nP7E0XptgNdNN+NBFQzmPMLVH9HpISYBdpJHtdEvQGMOioJBuI1+CIDiVvLoYfO1 /GeUHZsgcVLnPqW9EzBDKiEHwLc98omHIYJyqBa3s3z6FQ2JSfX7227y2vnzttX6sAIq 5/4tWEHJgLT1RNwHf7/Uv/hugV1t/a35FLzv04TRr3QRTQ6a0Xb5+Nvpp1hrbwmiup48 h+2Q== MIME-Version: 1.0 X-Received: by 10.68.198.101 with SMTP id jb5mr23635415pbc.84.1430761080921; Mon, 04 May 2015 10:38:00 -0700 (PDT) Sender: cschuber@gmail.com Received: by 10.70.128.10 with HTTP; Mon, 4 May 2015 10:38:00 -0700 (PDT) Received: by 10.70.128.10 with HTTP; Mon, 4 May 2015 10:38:00 -0700 (PDT) In-Reply-To: References: <861766483.4.1430730824975.JavaMail.jenkins@jenkins-9.freebsd.org> <201505041326.t44DQH1E046967@slippy.cwsent.com> Date: Mon, 4 May 2015 10:38:00 -0700 X-Google-Sender-Auth: oPZclCSC9c7k9GpyQ8VQSJSAJnE Message-ID: Subject: Re: Build failed in Jenkins: FreeBSD_HEAD #2725 From: Cy Schubert To: Craig Rodrigues Cc: jenkins-admin@freebsd.org, freebsd-current Current Content-Type: text/plain; charset=UTF-8 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 List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 04 May 2015 17:38:01 -0000 I think jenkins copy of head still contains ntp_parser.y. I see no issue here. Cy Schubert 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" wrote: > That file was deleted long ago. > > Cy Schubert > > On May 4, 2015 7:49 AM, "Craig Rodrigues" wrote: > >> >> >> On Monday, May 4, 2015, Cy Schubert 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 >> >> >> >>