2012/8/14 Christopher Schultz <ch...@christopherschultz.net>: > >> 2. The "svn patch" command does not update mergeinfo, but mergeinfo >> can be updated explicitly by doing a "svn merge --record-only". > > Understood. I almost never do 'svn patch' but instead do 'svn merge'. I > didn't know that one could perform a record-only merge, but it sounds > like that is a little foolish when the actual patch wasn't really merged > but instead a different (but semantically similar or identical) patch > was committed instead.
"svn merge --record-only" is not far away from the usual "svn propset". It is just that the syntax is different, so that you can avoid editing mergeinfo property by hand. Technically, the presence of mergeinfo prevents Subversion from merging the changes from the same revision twice. That is all. (IMHO). The rest is just some fruits that some tools can derive from this information. E.g. TortoiseSVN merge dialog shows revisions that have been already merged using gray color. (The SVN library will ignore those revisions if you try to merge them). E.g. "svn log -g" uses mergeinfo to show additional information in the log. On your question of "that is a little foolish": Regardless of the patch, if you consider those revisions processed, so nothing from them should ever be automatically merged again into this version of Tomcat, you can record this fact by including those revisions into the mergeinfo. Best regards, Konstantin Kolinko --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
