For bug #181021, preserve timestamps from during merge. For replacement operations...
authorZac Medico <zmedico@gentoo.org>
Fri, 8 Jun 2007 19:54:15 +0000 (19:54 -0000)
committerZac Medico <zmedico@gentoo.org>
Fri, 8 Jun 2007 19:54:15 +0000 (19:54 -0000)
commit9afcc2a0547ed77733c714050336d98fbda0821b
tree3278580efd60a447c52e3f6aa8d154fa89dfe7f5
parent87510cdd5f5e9b741b6b1efe29767bb858dd32e9
For bug #181021, preserve timestamps from  during merge.  For replacement operations, the unmerge phase checks the contents of the newer instance in order to prevent identical files in the newer instance from being unmerged. (trunk r6739, r6740, and r6745)

svn path=/main/branches/2.1.2/; revision=6760
pym/portage.py