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> In-Reply-To: <562E4225.4040807@FreeBSD.org> References: <201510261450.t9QEoaxo099839@repo.freebsd.org> <562E4085.4080007@FreeBSD.org> <562E4225.4040807@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
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.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20151026155525.GJ97830>