Re: [matplotlib-devel] svnmerge strangeness

2009-09-21 Thread John Hunter
On Mon, Sep 21, 2009 at 7:04 AM, Michael Droettboom 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

Re: [matplotlib-devel] svnmerge strangeness

2009-09-21 Thread Michael Droettboom
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

[matplotlib-devel] svnmerge strangeness

2009-09-20 Thread John Hunter
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: exampl