From owner-svn-src-head@freebsd.org  Mon Oct 26 15:55:29 2015
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@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 9890C85CE;
 Mon, 26 Oct 2015 15:55:29 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from cell.glebius.int.ru (glebius.int.ru [81.19.69.10])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "cell.glebius.int.ru", Issuer "cell.glebius.int.ru" (not verified))
 by mx1.freebsd.org (Postfix) with ESMTPS id 231DD1A83;
 Mon, 26 Oct 2015 15:55:28 +0000 (UTC)
 (envelope-from glebius@FreeBSD.org)
Received: from cell.glebius.int.ru (localhost [127.0.0.1])
 by cell.glebius.int.ru (8.15.2/8.15.2) with ESMTPS id t9QFtP0S033886
 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO);
 Mon, 26 Oct 2015 18:55:25 +0300 (MSK)
 (envelope-from glebius@FreeBSD.org)
Received: (from glebius@localhost)
 by cell.glebius.int.ru (8.15.2/8.15.2/Submit) id t9QFtPVF033885;
 Mon, 26 Oct 2015 18:55:25 +0300 (MSK)
 (envelope-from glebius@FreeBSD.org)
X-Authentication-Warning: cell.glebius.int.ru: glebius set sender to
 glebius@FreeBSD.org using -f
Date: Mon, 26 Oct 2015 18:55:25 +0300
From: Gleb Smirnoff <glebius@FreeBSD.org>
To: Roger Pau =?iso-8859-1?Q?Monn=E9?= <royger@FreeBSD.org>
Cc: Andriy Gapon <avg@FreeBSD.org>, src-committers@FreeBSD.org,
 svn-src-all@FreeBSD.org, svn-src-head@FreeBSD.org
Subject: Re: svn commit: r290005 - head/sys/dev/xen/blkfront head/sys/x86/x86
 svnadmin/tools/checkacl
Message-ID: <20151026155525.GJ97830@FreeBSD.org>
References: <201510261450.t9QEoaxo099839@repo.freebsd.org>
 <562E4085.4080007@FreeBSD.org> <562E4225.4040807@FreeBSD.org>
MIME-Version: 1.0
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
In-Reply-To: <562E4225.4040807@FreeBSD.org>
User-Agent: Mutt/1.5.23 (2014-03-12)
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 26 Oct 2015 15:55:29 -0000

On Mon, Oct 26, 2015 at 04:09:25PM +0100, Roger Pau Monné wrote:
R> El 26/10/15 a les 16.02, Andriy Gapon ha escrit:
R> > On 26/10/2015 16:50, Roger Pau Monné 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 did
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:

svn diff -c 289836 | svn patch --reverse-diff
svn diff -c 289834 | svn patch --reverse-diff

-- 
Totus tuus, Glebius.