<html><head></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; -webkit-line-break: after-white-space; ">Hi,<div><br></div><div><div>Using svn merge instead of diff-then-apply is better for tracking file revisions, especially when it comes to moving/deleting files etc[1].</div><div>I think it important to use svn merge at least when files are renamed/moved/deleted - both for a better revision tracking and for merging correctness. Also helps with conflicts.</div><div><br></div><div>Cheers,</div><div>Mircea</div><div><br></div><div>[1] <a href="http://gcc.gnu.org/wiki/SvnMerge">http://gcc.gnu.org/wiki/SvnMerge</a></div></div></body></html>