summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2009-02-24 23:16:42 +0000
committerZac Medico <zmedico@gentoo.org>2009-02-24 23:16:42 +0000
commit356acce97b8ae68cf58e814da7ca06bad45fcd4a (patch)
tree152c437367884c10e5782255b82dd3e3c74e3abb
parentIf deepcopy() raises a TypeError for a lazy item that has been added via a (diff)
downloadportage-idfetch-356acce97b8ae68cf58e814da7ca06bad45fcd4a.tar.gz
portage-idfetch-356acce97b8ae68cf58e814da7ca06bad45fcd4a.tar.bz2
portage-idfetch-356acce97b8ae68cf58e814da7ca06bad45fcd4a.zip
Bug #259882 - Disable the ignore-previously-merged option by default since
emerge's confmem already provides similar functionality which is a little safer. svn path=/main/trunk/; revision=12705
-rw-r--r--cnf/dispatch-conf.conf4
1 files changed, 3 insertions, 1 deletions
diff --git a/cnf/dispatch-conf.conf b/cnf/dispatch-conf.conf
index d9ccc12a..4fed0328 100644
--- a/cnf/dispatch-conf.conf
+++ b/cnf/dispatch-conf.conf
@@ -34,8 +34,10 @@ replace-unmodified=no
# Ignore a version that is identical to the previously merged version,
# even though it is different from the current user modified version
+# Note that emerge already has a similar feature enabled by default,
+# which can be disabled by the emerge --noconfmem option.
# (yes or no)
-ignore-previously-merged=yes
+ignore-previously-merged=no
# Per-session log file of changes made to configuration files
#log-file=/var/log/dispatch-conf.log