merge: abort if symlink replacing dir
authorZac Medico <zmedico@gentoo.org>
Wed, 27 Jul 2011 01:51:25 +0000 (18:51 -0700)
committerZac Medico <zmedico@gentoo.org>
Wed, 27 Jul 2011 01:51:25 +0000 (18:51 -0700)
commita4a4d87786e6c0c34370870af2071904d6184a9d
tree8d5a1cc64817e0bdf7161f1d9205054dbed8b9d1
parent6d007e4571da8845d55ac25c372ea26e3dec34fb
merge: abort if symlink replacing dir

This is required for compliance with PMS section 13.4 as discussed in
bug #326685.
pym/portage/dbapi/vartree.py