On Wed, Jan 26, 2011 at 6:42 AM, Pauli Virtanen <p...@iki.fi> wrote:
> Wed, 26 Jan 2011 20:35:03 +0900, Jae-Joon Lee wrote:
>> On Wed, Jan 26, 2011 at 7:28 PM, Pauli Virtanen
>> <p...@iki.fi> wrote:
>>> The complete magic stanza is:
>>>
>>> git reflog expire --expire=0 --all
>>> git prune
>>> git repack -f -a -d
>>> git gc --prune=0
>>
>> Wonderful!
>> With this, I get about 40 MB!
>
> Some additional compression can be obtained by passing also suitable
> values for the --window and --depth flags for git repack.
>
> http://metalinguist.wordpress.com/2007/12/06/the-woes-of-git-gc-aggressive-and-how-git-deltas-work/
Thank you all for the helpful feedback. I'll work on this again this evening.
Last night I noticed that, in the git repo, the commit messages
produced by svnmerge.py still contain a lot of svn-specific
information. Pauli's conversion script includes a step that filters
out two lines at the end of each commit containing some svn metadata,
but for svnmerge commits we still end up with:
Merged revisions 8933 via svnmerge from
https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_maint
........
r8933 | weathergod | 2011-01-22 10:35:26 -0600 (Sat, 22 Jan
2011) | 3 lines
Fixing problem where reversed colormaps of
LinearSegmentedColormaps were not initialized properly.
Thanks to LittleBigBrain for reporting and Friedrich Romstedt
for making the original patch.
........
Do we live with this, or try to replace references to svn commits with
their git hash and references to svn branches with the git ones? I
tried merging the v.1.0.x branch into master, which applied pretty
cleanly, with only a few minor merge conflicts:
$ git merge origin/v1.0.x
Auto-merging CHANGELOG
CONFLICT (content): Merge conflict in CHANGELOG
Auto-merging examples/api/quad_bezier.py
CONFLICT (content): Merge conflict in examples/api/quad_bezier.py
Auto-merging lib/matplotlib/__init__.py
CONFLICT (content): Merge conflict in lib/matplotlib/__init__.py
Auto-merging lib/matplotlib/axes.py
Auto-merging lib/matplotlib/backends/backend_macosx.py
Auto-merging lib/matplotlib/backends/backend_ps.py
Auto-merging lib/matplotlib/backends/backend_qt4.py
Auto-merging lib/matplotlib/tests/test_axes.py
Auto-merging lib/matplotlib/text.py
Auto-merging lib/matplotlib/ticker.py
CONFLICT (content): Merge conflict in lib/matplotlib/ticker.py
Auto-merging src/_gtkagg.cpp
Auto-merging src/_macosx.m
CONFLICT (content): Merge conflict in src/_macosx.m
Here is the CHANGELOG:
<<<<<<< HEAD
2011-01-13 Added zdir and offset arguments to contourf3d to
bring contourf3d in feature parity with contour3d. - BVR
2011-01-04 Tag 1.0.1 for release at r8896
2011-01-03 Added display of ticker offset to 3d plots. - BVR
2011-01-03 Turn off tick labeling on interior subplots for
pyplots.subplots when sharex/sharey is True. - JDH
2010-12-29 Implment axes_divider.HBox and VBox. -JJL
=======
2011-01-04 Tag 1.0.1 for release at r8896
>>>>>>> origin/v1.0.x
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
Matplotlib-devel mailing list
Matplotlib-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
