Michael Droettboom wrote: > John Hunter wrote: > >> On Thu, May 29, 2008 at 9:49 AM, Michael Droettboom <md...@st...> 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 >> >> johnh@flag: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 >> >> johnh@flag: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. > I lied. There is one keyboard mapping I added that I've found pretty useful: (global-set-key (kbd "s-s") 'svn-status-switch-to-status-buffer) (define-key svn-status-mode-map (kbd "s-s") 'svn-status-bury-buffer) This lets me toggle between the file I'm editing and the svn-status buffer using "Super-s" (Windows key-s). Makes it very convenient to edit a file, check the differences against the repository, and check them in. Cheers, Mike