2011/9/12 Rainer Jung <rainer.j...@kippdata.de>: > Which commands should we typically use to merge from trunk to tc7? > How would we cherry-pick the changes we want to merge? >
The rule is that merge command should be invoked from root of the project (the /tc7.0.x/trunk directory here), so that mergeinfo property is updated only there. Regarding cherry-picking: svn:mergeinfo only means that the revision mentioned in mergeinfo will be skipped when you will do a re-merge with a range of revisions that includes the one. If you mean cherry-picking as selecting some files among those committed in some revision: - If omitted files do not make sense on tc7 (e.g. an update to changelog.xml), you would just revert the changes on them before committing to TC7/TC6, but will mark the whole revision as merged. - If omitted files do make sense (e.g. original change included both http and ajp connectors, and you are merging changes to http connector, but are skipping ajp ones leaving them for a later commit) then you mark only that subtree as merged (invoke merge not from root). If you mean cherry-picking as selecting some revisions from a range, you would specify revision numbers during merge operation. Thus far the practice was that you specifically specify what single revisions you are merging, and thus those single revisions are added to the svn:mergeinfo on project root. I do not mind using ranges instead of single revisions. Best regards, Konstantin Kolinko --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscr...@tomcat.apache.org For additional commands, e-mail: dev-h...@tomcat.apache.org
