Date: Mon, 4 May 2015 12:44:34 -0400 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 Subject: Re: Build failed in Jenkins: FreeBSD_HEAD #2725 Message-ID: <CAG=rPVfPiS8%2B6FEvMmmXxs-cD6L_78uauw4OP0JDBLJ_eUKZGA@mail.gmail.com> 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%2BBeKbmd_JDQLve78iyqwAua3kL1SCD=i0eOnuSA@mail.gmail.com> <CAB8UbD1-UNkC73C64puNo8oGDm0mgCMogbFRpdCecBwVb_x13g@mail.gmail.com>
next in thread | previous in thread | raw e-mail | index | archive | help
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 >> >> >> >>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAG=rPVfPiS8%2B6FEvMmmXxs-cD6L_78uauw4OP0JDBLJ_eUKZGA>