From owner-svn-src-stable@FreeBSD.ORG Wed Mar 7 03:17:05 2012 Return-Path: Delivered-To: svn-src-stable@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id 7565C1065673; Wed, 7 Mar 2012 03:17:05 +0000 (UTC) (envelope-from pluknet@gmail.com) Received: from mail-lpp01m010-f54.google.com (mail-lpp01m010-f54.google.com [209.85.215.54]) by mx1.freebsd.org (Postfix) with ESMTP id ACC858FC0C; Wed, 7 Mar 2012 03:17:03 +0000 (UTC) Received: by lagv3 with SMTP id v3so9609252lag.13 for ; Tue, 06 Mar 2012 19:17:02 -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=vzWhP1wUTBBLfmn+iDd1vXt578n4jTnKEpaaQsbycaY=; b=x5kAD0zie1kx/EvWVItXp9XIP5dmSw4EF5I9qWzjPEd18b+IfK0mf8Ler1r4UZGROY SjtPQ8jHA9pwQf+8l0zSBtPn4HWA0AwJbAVV7R3or3gQWIRKjzJLHHe8ke0a5WM1bw6Q YLsgGz9lQpVuNE557A5b4n2AK4kRXK+JEuWO3oUDWQ56z0GxBd3w3h0TWoTLt1W74rkT 0kIfgdD3pEy6Y4Ve6OhPTWRIIbZaQZb/B82i1fT8Bz7vdkMMeOqJUTYswfFsT+RWcyLo VaTN80y861WHV3fIBWwbkA/ulosgW2raUbezJTFRtoAinKp6XH1ZDe0JWPl9+Fzmbl/n pSug== MIME-Version: 1.0 Received: by 10.112.102.161 with SMTP id fp1mr124117lbb.71.1331090222650; Tue, 06 Mar 2012 19:17:02 -0800 (PST) Sender: pluknet@gmail.com Received: by 10.152.21.73 with HTTP; Tue, 6 Mar 2012 19:17:02 -0800 (PST) In-Reply-To: <20120306190748.GB51782@jh> References: <201203061410.q26EAvav043586@svn.freebsd.org> <56c9876464416184673b0ea9b41f025e@evilcoder.org> <20120306190748.GB51782@jh> Date: Wed, 7 Mar 2012 06:17:02 +0300 X-Google-Sender-Auth: vtuQBFmE-WhDNDmIAhSgVdAKArc Message-ID: From: Sergey Kandaurov To: Jaakko Heinonen Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable Cc: Remko Lodder , svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-8@freebsd.org, Remko Lodder Subject: Re: svn commit: r232606 - stable/8 X-BeenThere: svn-src-stable@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: SVN commit messages for all the -stable branches of the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Mar 2012 03:17:05 -0000 On 6 March 2012 23:07, Jaakko Heinonen wrote: > On 2012-03-06, Remko Lodder wrote: >> On 06.03.2012 15:29, Sergey Kandaurov wrote: >> > >> > Eh, it seems you merged r238821 to stable/8, and that's wrong. > > Actually mergeinfo says r219005. > >> > Changes to top-level files should be merged directly to that file >> > rather than to the root of the whole tree (see rule 12). >> >> Point received and taken. I'll look after that the next time. How do I >> clean this up on the root? > > In the stable/8 root directory: > > $ svn merge -c -232606 . > $ svn revert ObsoleteFiles.inc > $ svn diff > > Property changes on: . > ___________________________________________________________________ > Modified: svn:mergeinfo > =A0 Reverse-merged /head:r219005 Yep, that is a way I used to reverse-merge things in stable together with mergeinfo. --=20 wbr, pluknet