On Wednesday, January 26, 2011, Darren Dale <dsdal...@gmail.com> wrote: > On Wed, Jan 26, 2011 at 7:44 AM, Darren Dale <dsdal...@gmail.com> wrote: >> 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 think I just convinced myself that replacing svn references with git > hashes would be a Herculean task. One could generate a > svn_rev:git_hash mapping, but then changing the commit message > actually yields a new git hash, breaking the mapping. Its not an > impossible task, but it would be a lot of work and difficult to check. > Leaving the svn path and revision information will probably be more > reliable. "git log --all" will therefore yield enough information that > we can easily identify the provenance of a cherry pick and find it in > the git history: > > commit adb1a7f67daf955a1af3a86d42b5181767c18819 > Author: Ben Root <ben.v.r...@gmail.com> > Date: Sat Jan 22 16:40:21 2011 +0000 > > Merged revisions 8933 via svnmerge from > > https://matplotlib.svn.sourceforge.net/svnroot/matplotlib/branches/v1_0_main > > ........ > r8933 | weathergod | 2011-01-22 10:35:26 -0600 (Sat, 22 Jan 2011) | 3 > line > > Fixing problem where reversed colormaps of LinearSegmentedColormaps > were n > Thanks to LittleBigBrain for reporting and Friedrich Romstedt for > making t > ........ > > svn path=/trunk/matplotlib/; revision=8934 > > commit 2fa57c710607496a93000bfb3191bdd422f518cc > Author: Ben Root <ben.v.r...@gmail.com> > Date: Sat Jan 22 16:35:26 2011 +0000 > > Fixing problem where reversed colormaps of LinearSegmentedColormaps were > not > Thanks to LittleBigBrain for reporting and Friedrich Romstedt for making > the > > svn path=/branches/v1_0_maint/; revision=8933 > > > Is this satisfactory? > > Darren >
I think it is fine. Maybe a nice convenience script would be one that would return a got hash for a svn revision number (and vice verse?). With that, I would be more than happy with how the logs are. Ben Root ------------------------------------------------------------------------------ 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