We've seen this before. It seems to have to do with files that were created after the branching. While I haven't found a solution, it's been going on a long time and seems to be benign.
(And, yeah, making the leap to a DVCS would probably not be a bad "solution" to this problem.) Mike On 07/20/2010 10:14 AM, Darren Dale wrote: > I am following the instructions in the coding guide to commit a change > on the maintenance branch, and merge that change into the trunk. I am > getting a bunch of unexpected property changes, so I interrupted the > commit. Is it ok to go ahead and let this finish?: > > [~/Projects/matplotlib] > dar...@waterhouse $ svnmerge merge -S v1_0_maint > /usr/bin/svnmerge:71: DeprecationWarning: The popen2 module is > deprecated. Use the subprocess module. > import sys, os, getopt, re, types, tempfile, time, popen2, locale > property 'svnmerge-integrated' set on '.' > > --- Merging r8566 into '.': > U CHANGELOG > U lib/matplotlib/backends/backend_qt4.py > > property 'svnmerge-integrated' set on '.' > > > [~/Projects/matplotlib] > dar...@waterhouse $ svn commit -F svnmerge-commit-message.txt > Sending . > Sending CHANGELOG > Sending doc/pyplots/README > Sending doc/sphinxext/gen_gallery.py > Sending doc/sphinxext/gen_rst.py > Sending examples/misc/multiprocess.py > Sending examples/mplot3d/contour3d_demo.py > Sending examples/mplot3d/contourf3d_demo.py > Sending examples/mplot3d/polys3d_demo.py > Sending examples/mplot3d/scatter3d_demo.py > Sending examples/mplot3d/surface3d_demo.py > Sending examples/mplot3d/wire3d_demo.py > Sending lib/matplotlib/backends/backend_qt4.py > Sending lib/matplotlib/sphinxext/mathmpl.py > Sending lib/matplotlib/sphinxext/only_directives.py > Sending lib/matplotlib/sphinxext/plot_directive.py > ^Csvn: Commit failed (details follow): > svn: At least one property change failed; repository is unchanged > svn: Caught signal > > [~/Projects/matplotlib] > dar...@waterhouse $ svn diff > > Property changes on: . > ___________________________________________________________________ > Modified: svnmerge-integrated > - /trunk/matplotlib:1-7315 /branches/mathtex:1-7263 > /branches/v0_98_5_maint:1-7253 /branches/v0_91_maint:1-6428 > /branches/v1_0_maint:1-8564 > + /branches/mathtex:1-7263 /branches/v0_91_maint:1-6428 > /branches/v0_98_5_maint:1-7253 /branches/v1_0_maint:1-8566 > /trunk/matplotlib:1-7315 > Modified: svn:mergeinfo > Merged /branches/v1_0_maint:r8566 > > Index: CHANGELOG > =================================================================== > --- CHANGELOG (revision 8566) > +++ CHANGELOG (working copy) > @@ -1,3 +1,5 @@ > +2010-07-20 Return Qt4's default cursor when leaving the canvas - DSD > + > 2010-07-06 Tagging for mpl 1.0 at r8502 > > > > Property changes on: doc/sphinxext/gen_gallery.py > ___________________________________________________________________ > Modified: svn:mergeinfo > Merged /branches/v1_0_maint/doc/sphinxext/gen_gallery.py:r8566 > > > Property changes on: doc/sphinxext/gen_rst.py > ___________________________________________________________________ > Modified: svn:mergeinfo > Merged /branches/v1_0_maint/doc/sphinxext/gen_rst.py:r8566 > > > Property changes on: doc/pyplots/README > ___________________________________________________________________ > Modified: svn:mergeinfo > Merged /branches/v1_0_maint/doc/pyplots/README:r8566 > > > Property changes on: lib/matplotlib/sphinxext/plot_directive.py > ___________________________________________________________________ > Modified: svn:mergeinfo > Merged > /branches/v1_0_maint/lib/matplotlib/sphinxext/plot_directive.py:r8566 > > > Property changes on: lib/matplotlib/sphinxext/mathmpl.py > ___________________________________________________________________ > Modified: svn:mergeinfo > Merged /branches/v1_0_maint/lib/matplotlib/sphinxext/mathmpl.py:r8566 > > > Property changes on: lib/matplotlib/sphinxext/only_directives.py > ___________________________________________________________________ > Modified: svn:mergeinfo > Merged > /branches/v1_0_maint/lib/matplotlib/sphinxext/only_directives.py:r8566 > > > Property changes on: > lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png > ___________________________________________________________________ > Modified: svn:mergeinfo > Merged > /branches/v1_0_maint/lib/matplotlib/tests/baseline_images/test_spines/spines_axes_positions.png:r8566 > > Index: lib/matplotlib/backends/backend_qt4.py > =================================================================== > --- lib/matplotlib/backends/backend_qt4.py (revision 8566) > +++ lib/matplotlib/backends/backend_qt4.py (working copy) > @@ -150,6 +150,7 @@ > FigureCanvasBase.enter_notify_event(self, event) > > def leaveEvent(self, event): > + QtGui.QApplication.restoreOverrideCursor() > FigureCanvasBase.leave_notify_event(self, event) > > def mousePressEvent( self, event ): > > Property changes on: examples/mplot3d/contourf3d_demo.py > ___________________________________________________________________ > Modified: svn:mergeinfo > Merged /branches/v1_0_maint/examples/mplot3d/contourf3d_demo.py:r8566 > > > Property changes on: examples/mplot3d/scatter3d_demo.py > ___________________________________________________________________ > Modified: svn:mergeinfo > Merged /branches/v1_0_maint/examples/mplot3d/scatter3d_demo.py:r8566 > > > Property changes on: examples/mplot3d/polys3d_demo.py > ___________________________________________________________________ > Modified: svn:mergeinfo > Merged /branches/v1_0_maint/examples/mplot3d/polys3d_demo.py:r8566 > > > Property changes on: examples/mplot3d/wire3d_demo.py > ___________________________________________________________________ > Modified: svn:mergeinfo > Merged /branches/v1_0_maint/examples/mplot3d/wire3d_demo.py:r8566 > > > Property changes on: examples/mplot3d/surface3d_demo.py > ___________________________________________________________________ > Modified: svn:mergeinfo > Merged /branches/v1_0_maint/examples/mplot3d/surface3d_demo.py:r8566 > > > Property changes on: examples/mplot3d/contour3d_demo.py > ___________________________________________________________________ > Modified: svn:mergeinfo > Merged /branches/v1_0_maint/examples/mplot3d/contour3d_demo.py:r8566 > > > Property changes on: examples/misc/multiprocess.py > ___________________________________________________________________ > Modified: svn:mergeinfo > Merged /branches/v1_0_maint/examples/misc/multiprocess.py:r8566 > > ------------------------------------------------------------------------------ > This SF.net email is sponsored by Sprint > What will you do first with EVO, the first 4G phone? > Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first > _______________________________________________ > Matplotlib-devel mailing list > Matplotlib-devel@lists.sourceforge.net > https://lists.sourceforge.net/lists/listinfo/matplotlib-devel > ------------------------------------------------------------------------------ This SF.net email is sponsored by Sprint What will you do first with EVO, the first 4G phone? Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
