John Hunter wrote: > On Thu, May 29, 2008 at 9:49 AM, Michael Droettboom <[EMAIL PROTECTED]> wrote: > > >> Minor point: On my machine at least, I don't have to manually clean up the >> conflict files -- they are removed for me on the next commit. Those files >> are really just for reference. If you use a SVN frontend for diffing (such >> as psvn.el or meld) they are largely unnecessary. >> > > On my machine I do need to manually purge these -- svn commit will > fail with a message like > > [EMAIL PROTECTED]:mpl> svn commit -F svnmerge-commit-message.txt > svn: Commit failed (details follow): > svn: Aborting commit: > '/home/titan/johnh/python/svn/matplotlib.trunk/matplotlib/lib/matplotlib/image.py' > remains in conflict > > > even if I have manually edited out all the conflicts. Oh -- it appears that "svn resolved" is what does this, not "svn commit". I didn't realise that just deleting the files was enough and have always used "svn resolved" as a matter of course. The convenient thing about "svn resolved" is you can do "svn -R resolved ." to resolve the whole tree once you're sure you're done. > I then need to do > > [EMAIL PROTECTED]:mpl> rm lib/matplotlib/image.py.* > > Maybe one of your emacs modes is helping you out behind the scenes? > Can you send me your emacs configs for svn? >
I use psvn.el, which is far easier to use IMHO than the built-in pcl-svn. You can get it here -- I haven't set any customizations on it. http://www.xsteve.at/prg/vc_svn/ My favorite feature is the integration with ediff -- press 'E' in the svn-status buffer and it brings up an ediff session between your working copy and the SVN revision it came from. Cheers, Mike ------------------------------------------------------------------------- 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
