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

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

On Thu, May 29, 2008 at 9:41 AM, Darren Dale <dar...@co...> wrote:

> Thats not what I want, I only want to commit the changes I made to CHANGELOG
> and texmanager. I tried reverting the changes with svn revert, but now when I
> do a diff, I get:
>
> $ svn diff
>
> Property changes on: .
> ___________________________________________________________________
> Modified: svnmerge-integrated
>   - /branches/v0_91_maint:1-5294
>   + /branches/v0_91_maint:1-5299

I already screwed up everything once royally, so I'll let Michael
comment on this.