on 16/01/2012 19:30 Jim Harris said the following: [snip] > Modified: > stable/9/sys/dev/ahci/ahci.c > stable/9/sys/dev/ata/ata-pci.h > stable/9/sys/dev/ata/chipsets/ata-intel.c > Directory Properties: > stable/9/ (props changed) > stable/9/sys/ (props changed) [snip]
The last two lines look incorrect. Are you following http://wiki.freebsd.org/SubversionPrimer/Merging ? Namely, this change should have been svn-merged to the 'sys' sub-directory. -- Andriy Gapon _______________________________________________ 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"
