From owner-svn-src-all@freebsd.org Mon Oct 26 15:58:17 2015 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 512E6875B for ; Mon, 26 Oct 2015 15:58:17 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: from mail-wi0-x230.google.com (mail-wi0-x230.google.com [IPv6:2a00:1450:400c:c05::230]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (Client CN "smtp.gmail.com", Issuer "Google Internet Authority G2" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id E1DBB1E80 for ; Mon, 26 Oct 2015 15:58:16 +0000 (UTC) (envelope-from lists@eitanadler.com) Received: by wikq8 with SMTP id q8so171351485wik.1 for ; Mon, 26 Oct 2015 08:58:15 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=eitanadler.com; s=0xdeadbeef; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc:content-type:content-transfer-encoding; bh=So+de1am7SnQNMxUSJShmAhjhIngDDgQjYgV6UEEJRo=; b=eOlpZA5pxkfM4ofoDZIppgObStVQUZoS1yFXtt/HUSfsgmYkCvApfE9H4pjopL3m9Z yB+YUTAWZxVZ1BukRhf7r5icFMNF5TTvNy+7NMSnUMm0L6IPDCPZ6z7tHEtZvuFTCJRC 3dep4ET5hcMuuXLOFoWRCu4t8VQrY0RI04rPs= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc:content-type:content-transfer-encoding; bh=So+de1am7SnQNMxUSJShmAhjhIngDDgQjYgV6UEEJRo=; b=UVckrz4ORO6LBqan76R+F2wlO4FYhIHbq5OYiPS78XhAsXfAWz9kZ8UTy+a0w18nqX afZcmbqu4SJwALuIc6lrQ+LGYxU/MxajlulnIJC4t5ev/Ujk5Nds548i5PZeNtTTkxxm 3FpGz/35RsuQxrIWTVNkZanPt9MIw5VuJNigg1IrVshtuyixwEFsdOZZHoOYi8klDmHM UpNvPNaiSkAb+GDin0N4gyewAUd2Ofy5zBivQtWhFSKPs/nPvQVg7wzQjcI1qGjMy283 9Rd/IiZH6C3MZsfgIgHTwgRS7PpcWJKzA7ZKjHPqdCy8uaK0mbz1Ogduo93nyraXGcCx I8ig== X-Gm-Message-State: ALoCoQlpS9CzXIjlOGIhPPuSE3d4bOzjY25V6/Sah+aEPizeFvfGWhVE4YdqNgDBkAdcRvSbVluT X-Received: by 10.180.206.212 with SMTP id lq20mr19966301wic.90.1445875094808; Mon, 26 Oct 2015 08:58:14 -0700 (PDT) MIME-Version: 1.0 Received: by 10.28.136.143 with HTTP; Mon, 26 Oct 2015 08:57:45 -0700 (PDT) In-Reply-To: <20151026155525.GJ97830@FreeBSD.org> References: <201510261450.t9QEoaxo099839@repo.freebsd.org> <562E4085.4080007@FreeBSD.org> <562E4225.4040807@FreeBSD.org> <20151026155525.GJ97830@FreeBSD.org> From: Eitan Adler Date: Mon, 26 Oct 2015 08:57:45 -0700 Message-ID: Subject: Re: svn commit: r290005 - head/sys/dev/xen/blkfront head/sys/x86/x86 svnadmin/tools/checkacl To: Gleb Smirnoff Cc: =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= , Andriy Gapon , "src-committers@freebsd.org" , "svn-src-all@freebsd.org" , "svn-src-head@freebsd.org" Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.20 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: Mon, 26 Oct 2015 15:58:17 -0000 On 26 October 2015 at 08:55, Gleb Smirnoff wrote: > On Mon, Oct 26, 2015 at 04:09:25PM +0100, Roger Pau Monn=C3=A9 wrote: > R> El 26/10/15 a les 16.02, Andriy Gapon ha escrit: > R> > On 26/10/2015 16:50, Roger Pau Monn=C3=A9 wrote: > R> >> Changes in other areas also in this revision: > R> >> Modified: > R> >> Directory Properties: > R> >> svnadmin/tools/checkacl/Makefile (props changed) > R> >> svnadmin/tools/checkacl/checkacl.c (props changed) > R> >> vendor/ (props changed) > R> > > R> > Seems like those shouldn't have been committed... > R> > R> Yes, something went wrong while doing the revert. For the record, I di= d > R> the following inside of the head/ folder: > R> > R> $ svn merge -c -289834,-289836 . > R> $ svn diff > R> $ svn ci > R> > R> I did a pre-commit diff, but props changes are not shown there. > > Merging is quite a weird way of reverting. IMO should be: Merging with a negative diff is the correct way of reverting. Using 'svn patch' loses information. --=20 Eitan Adler