Konstantin, On 4/15/14, 5:35 PM, Konstantin Kolinko wrote: > 2014-04-16 1:24 GMT+04:00 Christopher Schultz <ch...@christopherschultz.net>: >> All, >> >> I've been back-porting some patches from Tomcat 8 to Tomcat 7 today, and >> I can see that I'm modifying the mergeinfo for things like: >> >> Sending java/org/apache/tomcat/util/bcel >> Sending java/org/apache/tomcat/util/codec >> Sending java/org/apache/tomcat/util/http/fileupload >> Sending webapps/examples/WEB-INF/classes/websocket/tc7 >> Sending webapps/examples/websocket-deprecated >> >> Since I'm not modifying any of those linked directories, should I >> "revert" them before committing? Or is it better to have the mergeinfo >> attached to those for some reason? >> > > What is your svn client? > > SVN 1.8 (TortoiseSVN 1.8) did not update those mergeinfos when I did a merge. > But it updated them when I did a "record only" merge.
$ svn --version svn, version 1.8.5 (r1542147) compiled Dec 19 2013, 23:09:58 on x86_64-apple-darwin13.0.0 > Anyway I do not know of any harm from those mergeinfos. Both reverting > and non-reverting are OK with me. > > BTW, TortoiseSVN released an update yesterday. (HTTPS clients such as > svn are vulnerable to heartbleed from rogue servers). I use svn CLI (shown above) and Eclipse somewhat interchangeably. I usually use the CLI because I can see the whole diff before I commit all at once, then just change the command to "commit" and know it will commit exactly those changes. Using Eclipse's GUI just feels slower and more awkward to me. -chris
signature.asc
Description: OpenPGP digital signature
