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
On 6 March 2012 18:10, Remko Lodder re...@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:
On 06.03.2012 15:29, Sergey Kandaurov wrote:
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).
Point received and taken. I'll look after that the next time.
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
On 6 March 2012 23:07, Jaakko Heinonen j...@freebsd.org wrote:
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
