From owner-freebsd-current@FreeBSD.ORG Tue Jan 21 20:42:52 2014 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 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id D2BBF956; Tue, 21 Jan 2014 20:42:52 +0000 (UTC) Received: from mail-pd0-x233.google.com (mail-pd0-x233.google.com [IPv6:2607:f8b0:400e:c02::233]) (using TLSv1 with cipher ECDHE-RSA-RC4-SHA (128/128 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 9408F170E; Tue, 21 Jan 2014 20:42:52 +0000 (UTC) Received: by mail-pd0-f179.google.com with SMTP id q10so6632300pdj.38 for ; Tue, 21 Jan 2014 12:42:52 -0800 (PST) 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=McGzKm7kasb8146n8jt6imrU6KaLeay6izOXS1s/3os=; b=wVnWg1o0qq4TTQ1keOpW65Oq8tZ+PuhKNwdDMcU3JO3iouTHRyWK+6nF4T7nyoexhu w0ZuxklndNa5IiZkBdxhUX65dwx/uIu3uqmToSL8tQkOKjf6lGOsWOX3YGAAJR+GEfYE /RXLCS+U2m2rAuYADMnbA0ZaUPeRboCLDY9AG4R0mF6PRac1RgfaVewWiBssT/Kjh608 Hyi4Ag+1OaJL5Blt0douOlizq8PCTTTtDmXFB1lrPz2VgUs2jQ72hx8MlG42X3AqfVPC 7YM6F0pZ08dN6B6jCr7PBmsqJfFL7nZRLosw3oPtshW/hGLeokQbRJSqZT4A8qmW1Q98 064g== MIME-Version: 1.0 X-Received: by 10.69.31.97 with SMTP id kl1mr27331206pbd.62.1390336972247; Tue, 21 Jan 2014 12:42:52 -0800 (PST) Sender: kob6558@gmail.com Received: by 10.67.30.1 with HTTP; Tue, 21 Jan 2014 12:42:52 -0800 (PST) In-Reply-To: <201401211149.45793.jhb@freebsd.org> References: <5F09668C-0DEA-4074-A06C-BC4D29F92368@FreeBSD.org> <201401211149.45793.jhb@freebsd.org> Date: Tue, 21 Jan 2014 12:42:52 -0800 X-Google-Sender-Auth: XLFo3wo7nrJ9w3aQxpr9ysmPoL0 Message-ID: Subject: Re: freebsd-update From: Kevin Oberman To: John Baldwin Content-Type: text/plain; charset=UTF-8 X-Content-Filtered-By: Mailman/MimeDel 2.1.17 Cc: FreeBSD Current , David Chisnall , Ivan Voras , Antonio Olivares X-BeenThere: freebsd-current@freebsd.org X-Mailman-Version: 2.1.17 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: Tue, 21 Jan 2014 20:42:53 -0000 On Tue, Jan 21, 2014 at 8:49 AM, John Baldwin wrote: > On Tuesday, January 21, 2014 10:46:37 am David Chisnall wrote: > > > > On 21 Jan 2014, at 07:13, Antonio Olivares > wrote: > > > > > On Tue, Jan 21, 2014 at 7:49 AM, Ivan Voras > wrote: > > >> Hi, > > >> > > >> Is there any way I can avoid manually resolving hundreds of merge > > >> conflicts of the following type while using freebsd-update ? > > >> > > >> 1 <<<<<<< current version > > >> > > >> > > >> 2 # $FreeBSD: release/9.0.0/etc/csh.cshrc 50472 1999-08-27 23:37:10Z > > >> peter $ > > >> > > >> 3 ======= > > >> > > >> > > >> 4 # $FreeBSD: release/10.0.0/etc/csh.cshrc 50472 1999-08-27 23:37:10Z > > >> peter $ > > >> > > >> 5 >>>>>>> 10.0-RELEASE > > >> > > >> > > >> > > >> ? > > >> > > >> I can't be the only one seeing those...? > > >> > > > > > > Yes, One has to manually go one by one to fix these :( > > > I tried at one point a sed command like sed -i "" '>>>>' to fix > > > these, but it did not work correctly. I see errrors when booting when > > > I don't correct these :( > > > > I thought this was fixed already (I didn't see these in the 9.2->10-RC3 > upgrade). Doesn't freebsd-update pass -F (If the files differ only by VCS > Id > ($FreeBSD) install the new file) to mergemaster? > > AFAIK it doesn't use mergemaster? I thought it used its own tool? I > really > want to figure out a way to let it use etcupdate instead since it handles > this case even for locally modified files cleanly. > Having just gone through this on a 10.0-rc5 to 10.0-RELEASE run, I can assure you that it is not completely fixed. One huge part is fixed... every file's ID line is no longer is changed on every release. OTOH, for files that are modified, thy still show up. It hit many of the sendmail .cf files. Annoying as I don't even use sendmail. Not sure if there was a good reason Colin re-invented the wheel on this. It does not use mergemaster or even a reasonable differences editor such as the one mergemaster uses. Just going to the mergemaster code for handling diffs would be a HUGE win. I am getting really tired of "/<<<<3ddddn". -- R. Kevin Oberman, Network Engineer, Retired E-mail: rkoberman@gmail.com