summaryrefslogtreecommitdiff
path: root/CHANGES.txt
diff options
context:
space:
mode:
authorJason R. Coombs <jaraco@jaraco.com>2013-05-29 07:35:38 -0400
committerJason R. Coombs <jaraco@jaraco.com>2013-05-29 07:35:38 -0400
commit09b0b938b617e6b4f26a2cd1bf6c9e62ebbc6b57 (patch)
tree0d134831ab3a3255d19c6abd3614d60a131d32be /CHANGES.txt
parentb39c770280a208f82159352d2bdf086775b46d92 (diff)
downloadpython-setuptools-git-09b0b938b617e6b4f26a2cd1bf6c9e62ebbc6b57.tar.gz
Catch VersionConflict in distribute_setup when checking for setuptools 0.7 (to allow upgrade from setuptools to distribute). Fixes #3790.6.45
--HG-- branch : distribute
Diffstat (limited to 'CHANGES.txt')
-rw-r--r--CHANGES.txt7
1 files changed, 7 insertions, 0 deletions
diff --git a/CHANGES.txt b/CHANGES.txt
index e18a534b..ac7f59d1 100644
--- a/CHANGES.txt
+++ b/CHANGES.txt
@@ -3,6 +3,13 @@ CHANGES
=======
------
+0.6.45
+------
+
+* Issue #379: ``distribute_setup.py`` now traps VersionConflict as well,
+ restoring ability to upgrade from an older setuptools version.
+
+------
0.6.44
------