Quick ''%%svn merge%%'' cheatsheet:

<code>
svn co $REPO/stable/7
cd 7/sys
svn merge -c XXXX $REPO/head/sys .
svn ci
</code>

  * Do not merge below sys
  * In userland, merge high-level directories (e.g. libc)

[[/PEFS]] - Crypto file system