Author: gmazza Date: Fri Jul 8 03:41:16 2011 New Revision: 1144147 URL: http://svn.apache.org/viewvc?rev=1144147&view=rev Log: Merged revisions 1144145 via svnmerge from https://svn.apache.org/repos/asf/cxf/branches/2.4.x-fixes
................ r1144145 | gmazza | 2011-07-07 23:39:48 -0400 (Thu, 07 Jul 2011) | 9 lines Merged revisions 1144144 via svnmerge from https://svn.apache.org/repos/asf/cxf/trunk ........ r1144144 | gmazza | 2011-07-07 23:37:29 -0400 (Thu, 07 Jul 2011) | 1 line Added instructions to DoMerges ........ ................ Modified: cxf/branches/2.3.x-fixes/ (props changed) cxf/branches/2.3.x-fixes/bin/DoMerges.java Propchange: cxf/branches/2.3.x-fixes/ ------------------------------------------------------------------------------ Binary property 'svnmerge-integrated' - no diff available. Modified: cxf/branches/2.3.x-fixes/bin/DoMerges.java URL: http://svn.apache.org/viewvc/cxf/branches/2.3.x-fixes/bin/DoMerges.java?rev=1144147&r1=1144146&r2=1144147&view=diff ============================================================================== --- cxf/branches/2.3.x-fixes/bin/DoMerges.java (original) +++ cxf/branches/2.3.x-fixes/bin/DoMerges.java Fri Jul 8 03:41:16 2011 @@ -39,6 +39,26 @@ import java.util.*; What is more productive: Taking 30 minutes to bang this out in Java or spending a couple days learning another language that would allow me to bang it out in 15 minutes? + + Explanation of commands: + + [B]lock will permanently block the particular commit from being merged. + It won't ask again on subsequent runs of DoMerge. + + [I]gnore ignores the commit for the current DoMerges run, but will ask + again the next time you DoMerges. If you're not certain for a particular + commit use this option for someone else to determine on a later run. + + [R]ecord formally records that a merge occurred, but it does *not* + actually merge the commit. This is useful if you another tool to do + the merging (such as Git) but still wish to record a merge did occur. + + [F]lush will permanently save all the [B]'s and [R]'s you've earlier made, + useful when you need to stop DoMerges (due to a missed commit or other + problem) before it's complete. That way subsequent runs of DoMerges + won't go through the blocked/recorded items again. (Flushes occur + automatically when DoMerges is finished running.) + */ public class DoMerges {
