svnmerge other files?

Hi,

Can anyone explain why everytime I go to merge changes from the maintainance branch, it wants to tweak these files (besides the ones I actually changed)?

doc/pyplots/README
doc/sphinxext/gen_gallery.py
doc/sphinxext/gen_rst.py

Ryan

···


Ryan May
Graduate Research Assistant
School of Meteorology
University of Oklahoma
Sent from: Norman Oklahoma United States.

I don't know why -- but what is different about those files is that they were added on the branch since the branch was created. I couldn't find any others that were. Perhaps svnmerge.py doesn't track adds completely correctly.

In any case, it doesn't in fact change the content of these files (only touches them), so I consider that only a minor nuisance.

Mike

Ryan May wrote:

···

Hi,

Can anyone explain why everytime I go to merge changes from the maintainance branch, it wants to tweak these files (besides the ones I actually changed)?

doc/pyplots/README
doc/sphinxext/gen_gallery.py
doc/sphinxext/gen_rst.py

Ryan

--
Ryan May
Graduate Research Assistant
School of Meteorology
University of Oklahoma
Sent from: Norman Oklahoma United States.
------------------------------------------------------------------------

------------------------------------------------------------------------------
Open Source Business Conference (OSBC), March 24-25, 2009, San Francisco, CA
-OSBC tackles the biggest issue in open source: Open Sourcing the Enterprise
-Strategies to boost innovation and cut costs with open source participation
-Receive a $600 discount off the registration fee with the source code: SFAD
http://p.sf.net/sfu/XcvMzF8H
------------------------------------------------------------------------

_______________________________________________
Matplotlib-devel mailing list
Matplotlib-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
  
--
Michael Droettboom
Science Software Branch
Operations and Engineering Division
Space Telescope Science Institute
Operated by AURA for NASA