On 06.03.2012 15:13, Remko Lodder wrote:
The commit seems to mess up with the time schedule. Normally latest
entries are on top, but the merge somehow
got a lot of conflicts and now it isn't on top. Anyone has a suggestion
on how to properly fix this? (Same goes
for stable/8!)
Thanks
Remko
Author: remko
Date: Tue Mar 6 14:13:23 2012
New Revision: 232607
URL: http://svn.freebsd.org/changeset/base/232607
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/7/ObsoleteFiles.inc (contents, props changed)
Directory Properties:
stable/7/ (props changed)
Modified: stable/7/ObsoleteFiles.inc
==============================================================================
--- stable/7/ObsoleteFiles.inc Tue Mar 6 14:10:57 2012 (r232606)
+++ stable/7/ObsoleteFiles.inc Tue Mar 6 14:13:23 2012 (r232607)
@@ -14,6 +14,8 @@
# The file is partitioned: OLD_FILES first, then OLD_LIBS and
OLD_DIRS last.
#
+# 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
--
/"\ Best regards, | re...@freebsd.org
\ / Remko Lodder | remko@EFnet
X http://www.evilcoder.org/ |
/ \ ASCII Ribbon Campaign | Against HTML Mail and News
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
