Date: Mon, 26 Oct 2015 08:57:45 -0700 From: Eitan Adler <lists@eitanadler.com> To: Gleb Smirnoff <glebius@freebsd.org> Cc: =?UTF-8?Q?Roger_Pau_Monn=C3=A9?= <royger@freebsd.org>, Andriy Gapon <avg@freebsd.org>, "src-committers@freebsd.org" <src-committers@freebsd.org>, "svn-src-all@freebsd.org" <svn-src-all@freebsd.org>, "svn-src-head@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: <CAF6rxgn7uhrycnkFzYaAZ_0G5TuMd78P84UtRdQwbyXSJyMfmw@mail.gmail.com> 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>
next in thread | previous in thread | raw e-mail | index | archive | help
On 26 October 2015 at 08:55, Gleb Smirnoff <glebius@freebsd.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAF6rxgn7uhrycnkFzYaAZ_0G5TuMd78P84UtRdQwbyXSJyMfmw>