delta/python-setuptools-git.git/MERGE.txt, branch feature/restore-editable-pythonpath github.com: pypa/setuptools.git Moved MERGE.txt into the setuptools documentation. 2013-06-09T14:14:32+00:00 Jason R. Coombs jaraco@jaraco.com 2013-06-09T14:14:32+00:00 acce77b1dfb768dd7fdec3b76dc5c64d27320f82 --HG-- rename : MERGE.txt => docs/merge.txt 
--HG--
rename : MERGE.txt => docs/merge.txt
Add note about dropped support for Python 2.3 2013-05-28T14:51:36+00:00 Jason R. Coombs jaraco@jaraco.com 2013-05-28T14:51:36+00:00 d45dccf4ef6db592e73337da6a04ca1e4445341f 






Updated merge notes again to reference relevant changesets and final process
2013-05-12T11:10:02+00:00

Jason R. Coombs
jaraco@jaraco.com

2013-05-12T11:10:02+00:00

a0d19667eaa92bd95f2bebfcb50a68d0921282eb

--HG--
branch : Setuptools-Distribute merge





--HG--
branch : Setuptools-Distribute merge







Update merge notes again to reflect revised technique
2013-05-12T10:54:22+00:00

Jason R. Coombs
jaraco@jaraco.com

2013-05-12T10:54:22+00:00

c46bdf7f7f29f9cba3ff89450fb8cb49d9ddc109

--HG--
branch : Setuptools-Distribute merge





--HG--
branch : Setuptools-Distribute merge







Updated merge notes to reflect less invasive change (and regression). Thanks PJE for pointing out the flaw in my reasoning.
2013-05-05T02:37:14+00:00

Jason R. Coombs
jaraco@jaraco.com

2013-05-05T02:37:14+00:00

476342be985a7478e13618b578d111f7781b108b

--HG--
branch : Setuptools-Distribute merge
extra : source : 07d5668a8c0c09caf690c8f4f449eb46b4e45ab3





--HG--
branch : Setuptools-Distribute merge
extra : source : 07d5668a8c0c09caf690c8f4f449eb46b4e45ab3







Updated merge notes
2013-05-04T13:37:53+00:00

Jason R. Coombs
jaraco@jaraco.com

2013-05-04T13:37:53+00:00

2ef81e9e51106d228200737348d6646fe94ab435

--HG--
branch : Setuptools-Distribute merge
extra : source : 9d926f62c15cff2f25a9c8b8e9a2984246a5ba5c





--HG--
branch : Setuptools-Distribute merge
extra : source : 9d926f62c15cff2f25a9c8b8e9a2984246a5ba5c







Merge setuptools.command.easy_install
2013-05-03T14:53:48+00:00

Jason R. Coombs
jaraco@jaraco.com

2013-05-03T14:53:48+00:00

3b7000ad8a3eba032d4d2654e31ae64c976cb494

--HG--
branch : Setuptools-Distribute merge





--HG--
branch : Setuptools-Distribute merge







easy_install once again honors setup.cfg if found in the current directory
2013-05-03T14:45:40+00:00

Jason R. Coombs
jaraco@jaraco.com

2013-05-03T14:45:40+00:00

eafde2c8f2870bbe61084c73783b71a3329cafa0

--HG--
branch : Setuptools-Distribute merge
extra : source : 422fc7e84eb2a22aa13df44dea6f138d7c840e83





--HG--
branch : Setuptools-Distribute merge
extra : source : 422fc7e84eb2a22aa13df44dea6f138d7c840e83







Backed out improper fix for distribute issue #174
2013-05-03T14:42:11+00:00

Jason R. Coombs
jaraco@jaraco.com

2013-05-03T14:42:11+00:00

f86079e4b6629d75a4650be64bdcbe89724138a8

--HG--
branch : Setuptools-Distribute merge
extra : source : 28eb706c219004e2dd83dcd1db37d952e8c66908





--HG--
branch : Setuptools-Distribute merge
extra : source : 28eb706c219004e2dd83dcd1db37d952e8c66908







Distributions are once again installed as zipped eggs by default.
2013-05-03T14:39:35+00:00

Jason R. Coombs
jaraco@jaraco.com

2013-05-03T14:39:35+00:00

9eebb2dfe17fa129f2201add401c8fb6eb0ebcc1

--HG--
branch : Setuptools-Distribute merge
extra : source : f3b1c801d877734669007ad4f5d8cee091a6c767





--HG--
branch : Setuptools-Distribute merge
extra : source : f3b1c801d877734669007ad4f5d8cee091a6c767