svnmerge strangeness

Development matplotlib-devel
1

Some files seem to get a properties modification on them every time
someone does an svn merge, eg

  examples/misc/multiprocess.py

which is rarely changed, but frequently has its svnmerge properties change

home:~/mpl> svn diff -rPREV:HEAD examples/misc/multiprocess.py

Property changes on: examples/misc/multiprocess.py

···

___________________________________________________________________
Name: svn:mergeinfo
   - /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794
   + /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796

home:~/mpl> examples/misc/multiprocess.py

Other examples that are frequently subject to properties changes are

U doc/sphinxext/gen_gallery.py
U doc/sphinxext/gen_rst.py
U examples/mplot3d/contourf3d_demo.py
U examples/mplot3d/scatter3d_demo.py
U examples/mplot3d/polys3d_demo.py
U examples/mplot3d/wire3d_demo.py
U examples/mplot3d/surface3d_demo.py
U examples/mplot3d/contour3d_demo.py

Any idea what is special about these files that is causing them to get
frequent property changes even when they are not modified apparently?

It is a minor nuisance, but it makes it harder to see what has
actually changed after a merge.

JDH

2

It's caused by the files having multiple locations (relative to the root of the source tree) in different branches, or existing in some branches but not in others. In other words, files that have been moved, deleted or added since branch creation. I think if we retire old branches (0.91, 0.98), which I'm in favor of, we might alleviate some of that (I'm not 100% sure, but it seems plausible).

Mike

···

On 09/20/2009 01:21 PM, John Hunter wrote:

Some files seem to get a properties modification on them every time
someone does an svn merge, eg

   examples/misc/multiprocess.py

which is rarely changed, but frequently has its svnmerge properties change

home:~/mpl> svn diff -rPREV:HEAD examples/misc/multiprocess.py

Property changes on: examples/misc/multiprocess.py
___________________________________________________________________
Name: svn:mergeinfo
    - /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794
    + /branches/v0_91_maint/examples/misc/log.py:5753-5771
/branches/v0_98_5_maint/examples/misc/log.py:6581,6585,6587,6589-6609,6614,6616,6625,6652,6660-6662,6672-6673,6714-6715,6717-6732,6752-6754,6761-6773,6781,6792,6800,6802,6805,6809,6811,6822,6827,6850,6854,6856,6859,6861-6873,6883-6884,6886,6890-6891,6906-6909,6911-6912,6915-6916,6918,6920-6925,6927-6928,6934,6941,6946,6948,6950,6952,6960,6972,6984-6985,6990,6995,6997-7001,7014,7016,7018,7024-7025,7033,7035,7042,7072,7080
/branches/v0_99_maint/examples/misc/multiprocess.py:7338,7393,7395-7404,7407-7424,7428-7433,7442-7444,7446,7475-7482,7484,7486,7489-7523,7567,7569,7582-7584,7616-7618,7633,7638,7703,7727-7734,7740-7741,7745,7751,7756,7762,7770,7772,7774,7776-7778,7780,7784,7788,7790,7792,7794,7796

home:~/mpl> examples/misc/multiprocess.py

Other examples that are frequently subject to properties changes are

  U doc/sphinxext/gen_gallery.py
  U doc/sphinxext/gen_rst.py
  U examples/mplot3d/contourf3d_demo.py
  U examples/mplot3d/scatter3d_demo.py
  U examples/mplot3d/polys3d_demo.py
  U examples/mplot3d/wire3d_demo.py
  U examples/mplot3d/surface3d_demo.py
  U examples/mplot3d/contour3d_demo.py

Any idea what is special about these files that is causing them to get
frequent property changes even when they are not modified apparently?

It is a minor nuisance, but it makes it harder to see what has
actually changed after a merge.

JDH

------------------------------------------------------------------------------
Come build with us! The BlackBerry® Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay
ahead of the curve. Join us from November 9-12, 2009. Register now!
http://p.sf.net/sfu/devconf
_______________________________________________
Matplotlib-devel mailing list
Matplotlib-devel@lists.sourceforge.net
matplotlib-devel List Signup and Options

3

I think it is safe to delete these branches

JDH

···

On Mon, Sep 21, 2009 at 7:04 AM, Michael Droettboom <mdroe@...31...> wrote:

It's caused by the files having multiple locations (relative to the root of
the source tree) in different branches, or existing in some branches but not
in others. In other words, files that have been moved, deleted or added
since branch creation. I think if we retire old branches (0.91, 0.98),
which I'm in favor of, we might alleviate some of that (I'm not 100% sure,
but it seems plausible).