Merged from trunk 7598:7599
authorFabian Groffen <grobian@gentoo.org>
Tue, 14 Aug 2007 19:04:00 +0000 (19:04 -0000)
committerFabian Groffen <grobian@gentoo.org>
Tue, 14 Aug 2007 19:04:00 +0000 (19:04 -0000)
commitc090fec963d081df9e491ec3c5a0745440202f82
tree92e7002cf4332a4aae65dc5ad8923a04eece73d6
parentb9cc587c459745371b46ae8c904b4a7eedbbb81c
   Merged from trunk 7598:7599

   | 7599    | For bug #188782, keep "nomerge" nodes in the graph during    |
   | zmedico | the merge order calculation so that merge order is better in |
   |         | cases where installed packages have unsatisfied              |
   |         | dependencies.                                                |

svn path=/main/branches/prefix/; revision=7601
pym/emerge/__init__.py