svn commit: r232606 - stable/8

[Sergey Kandaurov]

On 6 March 2012 18:10, Remko Lodder <remko at freebsd.org> wrote:
> Author: remko
> Date: Tue Mar  6 14:10:57 2012
> New Revision: 232606
> URL: http://svn.freebsd.org/changeset/base/232606
>
> Log:
>  Merge r238821
>
>  Add sticky.8 to the obsolete files since it had been
>  moved to sticky.7
>
>  Submitted by: maxim and pluknet
>
>  With help from:       dim (because of awkward merge conflicts)
>
> Modified:
>  stable/8/ObsoleteFiles.inc   (contents, props changed)
> Directory Properties:
>  stable/8/   (props changed)

Eh, it seems you merged r238821 to stable/8, and that's wrong.
Changes to top-level files should be merged directly to that file
rather than to the root of the whole tree (see rule 12).

`svn diff -c 232606' gives me:

Index: ObsoleteFiles.inc
===================================================================
--- ObsoleteFiles.inc   (revision 232605)
+++ ObsoleteFiles.inc   (revision 232606)
@@ -19,6 +19,8 @@
 OLD_FILES+=usr/share/man/man9/cc.9.gz
 # 20101123: removed subblock.h from liblzma
 OLD_FILES+=usr/include/lzma/subblock.h
+# 20110224: sticky.8 -> sticky.7
+OLD_FILES+=usr/share/man/man8/sticky.8.gz
 # 20101114: Remove long-obsolete MAKEDEV.8
 OLD_FILES+=usr/share/man/man8/MAKEDEV.8.gz
 # 20101112: vgonel(9) has gone to private API a while ago

Property changes on: ObsoleteFiles.inc
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head/ObsoleteFiles.inc:r219005


Property changes on: .
___________________________________________________________________
Modified: svn:mergeinfo
   Merged /head:r219005


-- 
wbr,
pluknet