On Thursday 29 May 2008 10:15:07 am John Hunter wrote: > On Thu, May 29, 2008 at 9:11 AM, Darren Dale <[EMAIL PROTECTED]> wrote: > > I dont understand. I thought the point of svnmerge.py was to sync the > > change, not to introduce conflicts. Is the procedure you just outlined > > the standard operating procedure, or did svnmerge.py encounter problems? > > The procedure in your original post to this thread seems much more > > straight forward. > > I think the point is to keep track of which revisions you've already > merged (and resolved conflicts in) so you don't have to resolve them > again later. Michale pointed out to me offlist that in standard > usage, you do not need to manually give the revision number so my > original instructions advocating them were wrong.
I'm sorry, I just don't understand how to use this. I just got a clean checkout of the trunk, ran "svnmerge.py merge": $ svnmerge.py merge property 'svnmerge-integrated' set on '.' property 'svnmerge-blocked' deleted from '.'. --- Merging r5298 through r5299 into '.': U CHANGELOG C lib/matplotlib/texmanager.py C lib/matplotlib/backends/backend_svg.py property 'svnmerge-integrated' set on '.' property 'svnmerge-blocked' deleted from '.'. 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 Can I please just manually merge my changes in from the branch, without svnmerge.py? I really don't have time today to mess around with this. Darren ------------------------------------------------------------------------- This SF.net email is sponsored by: Microsoft Defy all challenges. Microsoft(R) Visual Studio 2008. http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/ _______________________________________________ Matplotlib-devel mailing list Matplotlib-devel@lists.sourceforge.net https://lists.sourceforge.net/lists/listinfo/matplotlib-devel
