svn commit: r290005 - head/sys/dev/xen/blkfront head/sys/x86/x86 svnadmin/tools/checkacl

[Eitan Adler]

On 26 October 2015 at 08:55, Gleb Smirnoff <glebius at freebsd.org> wrote:
> 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:

Merging with a negative diff is the correct way of reverting. Using
'svn patch' loses information.



-- 
Eitan Adler