Re: [matplotlib-devel] svnmerge.py - keeping the maintenance branch and trunk in sync

[John H. <jd...@gm...>]

On Thu, May 29, 2008 at 9:49 AM, Michael Droettboom <md...@st...> wrote:

> So, this is more the fault of operating procedure (choosing not to do the
> numpy renaming on the branch, for instance, which in itself was not a bad
> decision in isolation), than the tool itself.  Note that svnmerge did do the
> right thing in your merge on about five diffs, and only two couldn't be
> automatically merged.  In my own experience, merges work far more often than
> not, but as the trunk drifts further away from the branch, no doubt that
> percentage will go down...

My (limited) experience has been same -- merges usually ""just work".
Part of the drift (eg the npy, np differences) we are currently
dealing with is explained by me doing things the wrong way for a
while, before I go.  As more of us work to keep the branch in sync
where feasible, these kinds of problems should be less frequent.

JDH