From owner-svn-src-head@FreeBSD.ORG Sun Nov 9 10:11:54 2008 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 25AD11065676; Sun, 9 Nov 2008 10:11:54 +0000 (UTC) (envelope-from alexander@leidinger.net) Received: from redbull.bpaserver.net (redbullneu.bpaserver.net [213.198.78.217]) by mx1.freebsd.org (Postfix) with ESMTP id A241E8FC13; Sun, 9 Nov 2008 10:11:53 +0000 (UTC) (envelope-from alexander@leidinger.net) Received: from outgoing.leidinger.net (pD9E2F98A.dip.t-dialin.net [217.226.249.138]) by redbull.bpaserver.net (Postfix) with ESMTP id 1DF0C2E25E; Sun, 9 Nov 2008 11:11:44 +0100 (CET) Received: from webmail.leidinger.net (webmail.leidinger.net [192.168.1.102]) by outgoing.leidinger.net (Postfix) with ESMTP id 66CAB355EF; Sun, 9 Nov 2008 11:11:34 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=Leidinger.net; s=outgoing-alex; t=1226225494; bh=B9FlBm49AkC7J5z4/qg5LJCe33uh/bKZn iN/c2DzLg8=; h=Message-ID:Date:From:To:Cc:Subject:References: In-Reply-To:MIME-Version:Content-Type:Content-Transfer-Encoding; b=bZCIs8s97Cy8vykHCGTwjq29gAKeuvxM2LEQj/xxMgcXyw5Xssa0gL4K0VNCs1Hd9 VvOad8uXqKiWRPNpIUcVqkP5vLBUgGyDM3QeUlzXn6q2gocrfVG1N7Y09KfiHdqEEVS DoZhL3b+lNJVJJeWy+hX0IG673r+ZPXSaFL2XLbYjrKd6xcZ1WlRzWX8mL2mfMY7KY3 x6bRc9y2L4sgMixp1NUcw+OAk4HBczZFfpOp77Z0v+ejmyJJy2TP44hGiLgiTQHRaU0 TjIi/vZOnWY6Su7Y5+08vUdJTeBXBsRPAtWIkci83eDPgmr0B8QjyxIJIyEp78FNMKo vaxvSxNXQ== Received: (from www@localhost) by webmail.leidinger.net (8.14.2/8.13.8/Submit) id mA9ABYLf089965; Sun, 9 Nov 2008 11:11:34 +0100 (CET) (envelope-from Alexander@Leidinger.net) Received: from 192.168.2.100 ([192.168.2.100]) by webmail.leidinger.net (Horde Framework) with HTTP; Sun, 09 Nov 2008 11:11:33 +0100 Message-ID: <20081109111133.88165rocbmwehckc@webmail.leidinger.net> X-Priority: 3 (Normal) Date: Sun, 09 Nov 2008 11:11:33 +0100 From: Alexander Leidinger To: Maxim Sobolev References: <200811090758.mA97wNKt033972@svn.freebsd.org> In-Reply-To: <200811090758.mA97wNKt033972@svn.freebsd.org> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8; DelSp="Yes"; format="flowed" Content-Disposition: inline Content-Transfer-Encoding: quoted-printable User-Agent: Internet Messaging Program (IMP) H3 (4.3) / FreeBSD-8.0 X-BPAnet-MailScanner-Information: Please contact the ISP for more information X-MailScanner-ID: 1DF0C2E25E.6CF24 X-BPAnet-MailScanner: Found to be clean X-BPAnet-MailScanner-SpamCheck: not spam, ORDB-RBL, SpamAssassin (not cached, score=-14.813, required 6, BAYES_00 -15.00, DKIM_SIGNED 0.00, DKIM_VERIFIED -0.00, NO_RDNS2 0.01, RDNS_DYNAMIC 0.10, TW_SV 0.08) X-BPAnet-MailScanner-From: alexander@leidinger.net X-Spam-Status: No Cc: svn-src-head@FreeBSD.org, svn-src-all@FreeBSD.org, src-committers@FreeBSD.org Subject: Re: svn commit: r184781 - head/usr.sbin/mergemaster X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 09 Nov 2008 10:11:54 -0000 Quoting Maxim Sobolev (from Sun, 9 Nov 2008 =20 07:58:23 +0000 (UTC)): > Author: sobomax > Date: Sun Nov 9 07:58:23 2008 > New Revision: 184781 > URL: http://svn.freebsd.org/changeset/base/184781 > > Log: > Ignore files that only differ in CVS Id tag. I would like to have (ideally automatic) replacement of files in this =20 case. Is it still possible to get the new file there with mergemaster =20 after this patch? Bye, Alexander. > MFC after:=092 weeks > > Modified: > head/usr.sbin/mergemaster/mergemaster.sh > > Modified: head/usr.sbin/mergemaster/mergemaster.sh > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- head/usr.sbin/mergemaster/mergemaster.sh=09Sun Nov 9 07:34:11 =20 > 2008=09(r184780) > +++ head/usr.sbin/mergemaster/mergemaster.sh=09Sun Nov 9 07:58:23 =20 > 2008=09(r184781) > @@ -947,6 +947,20 @@ for COMPFILE in `find . -type f -size +0 > echo " *** Temp ${COMPFILE} and installed have the same CVS =20 > Id, deleting" > rm "${COMPFILE}" > ;; > + > + *) > + tempfoo=3D`basename $0` > + TMPFILE1=3D`mktemp -t ${tempfoo}` || break > + TMPFILE2=3D`mktemp -t ${tempfoo}` || break > + sed "s/[$]${CVS_ID_TAG}:.*[$]//g" "${DESTDIR}${COMPFILE#.}" > =20 > "${TMPFILE1}" > + sed "s/[$]${CVS_ID_TAG}:.*[$]//g" "${COMPFILE}" > "${TMPFILE2}" > + if diff -q ${DIFF_OPTIONS} "${TMPFILE1}" "${TMPFILE2}" > \ > + /dev/null 2>&1; then > + echo " *** Temp ${COMPFILE} and installed are the same =20 > except CVS Id, deleting" > + rm "${COMPFILE}" > + fi > + rm -f "${TMPFILE1}" "${TMPFILE2}" > + ;; > esac > ;; > esac > > --=20 BOFH excuse #171: NOTICE: alloc: /dev/null: filesystem full http://www.Leidinger.net Alexander @ Leidinger.net: PGP ID =3D B0063FE7 http://www.FreeBSD.org netchild @ FreeBSD.org : PGP ID =3D 72077137