You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@tomcat.apache.org by Christopher Schultz <ch...@christopherschultz.net> on 2014/04/15 23:24:46 UTC
Back-porting patches; margeinfo for svn-linked directories
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?
Thanks,
-chris
Re: Back-porting patches; margeinfo for svn-linked directories
Posted by Mark Thomas <ma...@apache.org>.
On 15/04/2014 22:24, Christopher Schultz wrote:
> 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?
Please revert it before committing.
Cheers,
Mark
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Back-porting patches; margeinfo for svn-linked directories
Posted by Konstantin Kolinko <kn...@gmail.com>.
2014-04-19 0:06 GMT+04:00 Rainer Jung <ra...@kippdata.de>:
> On 18.04.2014 21:43, Christopher Schultz wrote:
>
>> On 4/18/14, 7:45 AM, Rainer Jung wrote:
>>> On 15.04.2014 23:45, Christopher Schultz wrote:
>>
>> I've never explicitly checked-out e.g. jdbc-pool, but it gets pulled-in
>> when I checkout tc7.0.x/trunk. Merging from tomcat/trunk into
>> tc7.0.x/trunk, even with no changes to e.g. jdbc-pool, svn puts
>> mergeinfo into those pulled-in directories.
>
> I was talking about the directories to which your commit added mergeinfo:
>
> tomcat/tc7.0.x/trunk/ (props changed)
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/codec/ (props
> changed)
> tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/
> (props changed)
> tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/tc7/
> (props changed)
> tomcat/tc7.0.x/trunk/webapps/examples/websocket-deprecated/ (props
> changed)
>
> Those are not pulled in via externals like jdbc-pool.
>
Tomcat 7 does not use externals for jdbc-pool since r1360704 (Jul 12 2012)
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Back-porting patches; margeinfo for svn-linked directories
Posted by Rainer Jung <ra...@kippdata.de>.
On 18.04.2014 21:43, Christopher Schultz wrote:
> On 4/18/14, 7:45 AM, Rainer Jung wrote:
>> On 15.04.2014 23:45, Christopher Schultz wrote:
>>> 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.
>>
>> I kind of remember additional mergeinfos popping up when you merge into
>> a mixed revision workspace, ie. a workspace that contains committed
>> changes but the commits were done in sub directories. If that is the
>> case, you can omit the various mergeinfos by always merging into and
>> committing from an up-to-date workspace (svn up).
>
> I've never explicitly checked-out e.g. jdbc-pool, but it gets pulled-in
> when I checkout tc7.0.x/trunk. Merging from tomcat/trunk into
> tc7.0.x/trunk, even with no changes to e.g. jdbc-pool, svn puts
> mergeinfo into those pulled-in directories.
I was talking about the directories to which your commit added mergeinfo:
tomcat/tc7.0.x/trunk/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/bcel/ (props changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/codec/ (props
changed)
tomcat/tc7.0.x/trunk/java/org/apache/tomcat/util/http/fileupload/
(props changed)
tomcat/tc7.0.x/trunk/webapps/examples/WEB-INF/classes/websocket/tc7/
(props changed)
tomcat/tc7.0.x/trunk/webapps/examples/websocket-deprecated/ (props
changed)
Those are not pulled in via externals like jdbc-pool.
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Back-porting patches; margeinfo for svn-linked directories
Posted by Christopher Schultz <ch...@christopherschultz.net>.
Rainer,
On 4/18/14, 7:45 AM, Rainer Jung wrote:
> On 15.04.2014 23:45, Christopher Schultz wrote:
>> 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.
>
> I kind of remember additional mergeinfos popping up when you merge into
> a mixed revision workspace, ie. a workspace that contains committed
> changes but the commits were done in sub directories. If that is the
> case, you can omit the various mergeinfos by always merging into and
> committing from an up-to-date workspace (svn up).
I've never explicitly checked-out e.g. jdbc-pool, but it gets pulled-in
when I checkout tc7.0.x/trunk. Merging from tomcat/trunk into
tc7.0.x/trunk, even with no changes to e.g. jdbc-pool, svn puts
mergeinfo into those pulled-in directories.
-chris
Re: Back-porting patches; margeinfo for svn-linked directories
Posted by Rainer Jung <ra...@kippdata.de>.
On 15.04.2014 23:45, Christopher Schultz wrote:
> 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.
I kind of remember additional mergeinfos popping up when you merge into
a mixed revision workspace, ie. a workspace that contains committed
changes but the commits were done in sub directories. If that is the
case, you can omit the various mergeinfos by always merging into and
committing from an up-to-date workspace (svn up).
Regards,
Rainer
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org
Re: Back-porting patches; margeinfo for svn-linked directories
Posted by Christopher Schultz <ch...@christopherschultz.net>.
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
Re: Back-porting patches; margeinfo for svn-linked directories
Posted by Konstantin Kolinko <kn...@gmail.com>.
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.
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).
Best regards,
Konstantin Kolinko
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org