svn commit: r232606 - stable/8

[Jaakko Heinonen]

On 2012-03-06, Remko Lodder wrote:
> On 06.03.2012 15:29, Sergey Kandaurov wrote:
> >
> > Eh, it seems you merged r238821 to stable/8, and that's wrong.

Actually mergeinfo says r219005.

> > Changes to top-level files should be merged directly to that file
> > rather than to the root of the whole tree (see rule 12).
> 
> Point received and taken. I'll look after that the next time. How do I 
> clean this up on the root?

In the stable/8 root directory:

$ svn merge -c -232606 .
$ svn revert ObsoleteFiles.inc
$ svn diff

Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Reverse-merged /head:r219005


-- 
Jaakko