From owner-svn-src-all@FreeBSD.ORG Tue Mar 6 14:29:54 2012 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id B02D2106564A; Tue, 6 Mar 2012 14:29:54 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-ey0-f182.google.com (mail-ey0-f182.google.com [209.85.215.182]) by mx1.freebsd.org (Postfix) with ESMTP id B30A38FC17; Tue, 6 Mar 2012 14:29:52 +0000 (UTC) Received: by eaaf13 with SMTP id f13so1903966eaa.13 for ; Tue, 06 Mar 2012 06:29:51 -0800 (PST) Received-SPF: pass (google.com: domain of pluknet@gmail.com designates 10.112.49.227 as permitted sender) client-ip=10.112.49.227; Authentication-Results: mr.google.com; spf=pass (google.com: domain of pluknet@gmail.com designates 10.112.49.227 as permitted sender) smtp.mail=pluknet@gmail.com; dkim=pass header.i=pluknet@gmail.com Received: from mr.google.com ([10.112.49.227]) by 10.112.49.227 with SMTP id x3mr2657377lbn.99.1331044191791 (num_hops = 1); Tue, 06 Mar 2012 06:29:51 -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 :x-google-sender-auth:message-id:subject:from:to:cc:content-type :content-transfer-encoding; bh=WJ4mgBiLPbS6mqW/lWYaeK4mpn2Y70H4d1L+S0z7WvA=; b=tSWviebJGEgZPJfn/KZdFAsi+Lvt+uK8DeytdV157TkWzY9Ai2HqPhkyWguNxIER/d Z5Z01kRaRKy1DSejefG3sUnVZq3d5ZNeIfjQ1KKjZvQI4W6EGOZCjbE3B3HaWFV5h+75 anAIV4Wj6ijpEVkvrhQBD2q88S7P/UGZunMoCKL9Zt8LqO1MPX+x4/CrRysqC6D9lp4f lzdNot7/WMe1XeXpIew/V5YLzZ5UWBTjhvtLnFMqtmY3hWOL3XS10u6KOv4U1Lr+KrSk 5wvPE7hlyisWXR22Hbwp47cwIC64pDYnkjaS4h1a30UCovp5yapMGWVttWsKBXHVsvCc 4+Iw== MIME-Version: 1.0 Received: by 10.112.49.227 with SMTP id x3mr2152758lbn.99.1331044191708; Tue, 06 Mar 2012 06:29:51 -0800 (PST) Sender: pluknet@gmail.com Received: by 10.152.21.73 with HTTP; Tue, 6 Mar 2012 06:29:51 -0800 (PST) In-Reply-To: <201203061410.q26EAvav043586@svn.freebsd.org> References: <201203061410.q26EAvav043586@svn.freebsd.org> Date: Tue, 6 Mar 2012 17:29:51 +0300 X-Google-Sender-Auth: W4J-qQPNK9hzoAcz9ISWUNTdxK4 Message-ID: From: Sergey Kandaurov To: Remko Lodder Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org Subject: Re: svn commit: r232606 - stable/8 X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 06 Mar 2012 14:29:54 -0000 On 6 March 2012 18:10, Remko Lodder wrote: > Author: remko > Date: Tue Mar =A06 14:10:57 2012 > New Revision: 232606 > URL: http://svn.freebsd.org/changeset/base/232606 > > Log: > =A0Merge r238821 > > =A0Add sticky.8 to the obsolete files since it had been > =A0moved to sticky.7 > > =A0Submitted by: maxim and pluknet > > =A0With help from: =A0 =A0 =A0 dim (because of awkward merge conflicts) > > Modified: > =A0stable/8/ObsoleteFiles.inc =A0 (contents, props changed) > Directory Properties: > =A0stable/8/ =A0 (props changed) Eh, it seems you merged r238821 to stable/8, and that's wrong. Changes to top-level files should be merged directly to that file rather than to the root of the whole tree (see rule 12). `svn diff -c 232606' gives me: Index: ObsoleteFiles.inc =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 --- ObsoleteFiles.inc (revision 232605) +++ ObsoleteFiles.inc (revision 232606) @@ -19,6 +19,8 @@ OLD_FILES+=3Dusr/share/man/man9/cc.9.gz # 20101123: removed subblock.h from liblzma OLD_FILES+=3Dusr/include/lzma/subblock.h +# 20110224: sticky.8 -> sticky.7 +OLD_FILES+=3Dusr/share/man/man8/sticky.8.gz # 20101114: Remove long-obsolete MAKEDEV.8 OLD_FILES+=3Dusr/share/man/man8/MAKEDEV.8.gz # 20101112: vgonel(9) has gone to private API a while ago Property changes on: ObsoleteFiles.inc ___________________________________________________________________ Modified: svn:mergeinfo Merged /head/ObsoleteFiles.inc:r219005 Property changes on: . ___________________________________________________________________ Modified: svn:mergeinfo Merged /head:r219005 --=20 wbr, pluknet