John Baldwin wrote:
...
That's because you merged to the file rather than to sys/. There's a set of instructions about mergning with SVN on the wiki that explains why to do kernel merges to sys/ instead of individual files.

I read them, having been pointed at them by kib@ -- but they didn't explain why contrib/pf was being touched at all.

In the absence of other information, I'll take this at face value, and commit the mergeinfo, although I would be happier understanding why contrib/pf is being touched by the merge.

Perhaps a purchase of the Subversion book is in my future.

thanks,
BMS

_______________________________________________
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"

Reply via email to