I'm trying to track down a change that used to be in trunk so that I can merge the change into a local build. The change can be seen here:

https://svn.apache.org/viewvc?view=rev&revision=542189

However, when I attempt to merge this change with a subsequent Tomcat image (either 6.0.14 or 6.0.15) it seems as if the change doesn't exist at all in the current trunk.

Here's the command I'm attempting to use to merge:
svn merge -r 542188:542189 https://svn.apache.org/repos/asf/tomcat/trunk/ .

When I view the current trunk and look at parts that were changed in that revision mentioned above the history does not show the changes.

I see that in http://svn.apache.org/viewvc?view=rev&revision=593649 a new trunk was created from 6.0.x/trunk but I don't see what happened to the old trunk. Any pointers?

Thanks,
Joe Bohn

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to