Merged from trunk -r14484:14485
authorFabian Groffen <grobian@gentoo.org>
Sun, 4 Oct 2009 08:14:46 +0000 (08:14 -0000)
committerFabian Groffen <grobian@gentoo.org>
Sun, 4 Oct 2009 08:14:46 +0000 (08:14 -0000)
commita2687562c3f7045c06b35e474ce777059a9412a5
tree409653a61788ee5fd8937fdf0b4d92d1e1d9e15f
parent07b9d77ff28ce1f905627837dfcceb2e86d5c742
   Merged from trunk -r14484:14485

   | 14485   | Generate an eerror message in dblink.mergeme when a file has |
   | zmedico | to be renamed in order to merge a directory to the same      |
   |         | path.                                                        |

svn path=/main/branches/prefix/; revision=14487
pym/portage/dbapi/vartree.py