You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by kk...@apache.org on 2011/09/12 12:10:55 UTC
svn commit: r1169674 - in /tomcat/tc7.0.x/trunk: ./
java/org/apache/catalina/core/DefaultInstanceManager.java
Author: kkolinko
Date: Mon Sep 12 10:10:54 2011
New Revision: 1169674
URL: http://svn.apache.org/viewvc?rev=1169674&view=rev
Log:
Followup to r1169453
Remove svn:mergeinfo on DefaultInstanceManager.java
Record r1169447 as merged on /tc7.0.x/trunk
Only svn:mergeinfo properties are changed.
Modified:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java (props changed)
Propchange: tomcat/tc7.0.x/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Sep 12 10:10:54 2011
@@ -1 +1 @@
-/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394
+/tomcat/trunk:1156171,1156276,1156304,1156530,1156602,1157015,1157018,1157151,1157198,1157204,1157810,1157832,1157834,1157847,1157908,1157939,1158155,1158160,1158176,1158195,1158198-1158199,1158227,1158331,1158334-1158335,1158426,1160347,1160592,1160611,1160619,1160626,1160639,1160652,1160720-1160721,1160772,1160774,1160776,1161303,1161310,1161322,1161339,1161486,1161540,1161549,1161584,1162082,1162149,1162169,1162721,1162769,1162836,1162932,1163630,1164419,1164438,1164469,1164480,1164567,1165234,1165247-1165248,1165253,1165273,1165282,1165309,1165331,1165338,1165347,1165360-1165361,1165367-1165368,1165602,1165608,1165677,1165693,1165721,1165723,1165728,1165730,1165738,1165746,1165765,1165777,1165918,1165921,1166077,1166150-1166151,1166290,1166366,1166620,1166686,1166752,1166757,1167368,1167394,1169447
Propchange: tomcat/tc7.0.x/trunk/java/org/apache/catalina/core/DefaultInstanceManager.java
('svn:mergeinfo' removed)
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1169674 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/DefaultInstanceManager.java
Posted by Rainer Jung <ra...@kippdata.de>.
Thanks Konstantin!
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1169674 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/DefaultInstanceManager.java
Posted by Konstantin Kolinko <kn...@gmail.com>.
2011/9/12 Rainer Jung <ra...@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-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: svn commit: r1169674 - in /tomcat/tc7.0.x/trunk: ./ java/org/apache/catalina/core/DefaultInstanceManager.java
Posted by Rainer Jung <ra...@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?
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org