Author: markt
Date: Mon Aug 22 14:15:00 2016
New Revision: 1757182
URL: http://svn.apache.org/viewvc?rev=1757182&view=rev
Log:
Rename file since sources are no longer just in svn
Added:
tomcat/trunk/MERGE.txt
- copied, changed from r1757181, tomcat/trunk/SVN-MERGE.txt
Removed:
tomcat/trunk/SVN-MERGE.txt
Copied: tomcat/trunk/MERGE.txt (from r1757181, tomcat/trunk/SVN-MERGE.txt)
URL:
http://svn.apache.org/viewvc/tomcat/trunk/MERGE.txt?p2=tomcat/trunk/MERGE.txt&p1=tomcat/trunk/SVN-MERGE.txt&r1=1757181&r2=1757182&rev=1757182&view=diff
==============================================================================
--- tomcat/trunk/SVN-MERGE.txt (original)
+++ tomcat/trunk/MERGE.txt Mon Aug 22 14:15:00 2016
@@ -21,11 +21,15 @@ ideal. These include:
- potential conflicts if a web application ships with the same JAR
- a large JAR where Tomcat only depends on a small fraction
-There are various approaches taken to dealing with this. One of those
approaches
-is to svn copy the classes to the Tomcat source tree, modify them (always with
a
-package rename, sometimes with additional changes) and then keep them in sync
-with the original via regular svn merges. This file keeps track of these copies
-to assist committers in keeping them up to date.
+
+SVN
+===
+
+For sources hosted in svn the approache is to svn copy the classes to the
Tomcat
+source tree, modify them (always with a package rename, sometimes with
+additional changes) and then keep them in sync with the original via regular
svn
+merges. This file keeps track of these copies to assist committers in keeping
+them up to date.
BCEL
org.apache.tomcat.util.bcel is copied from:
@@ -40,10 +44,8 @@ org.apache.tomcat.dbcp.pool2 is copied f
/commons/proper/pool/trunk/src/main/java/org/apache/commons/pool2
FileUpload
-org.apache.tomcat.util.http.fileupload is copied from:
-/commons/proper/fileupload/trunk/src/main/java/org/apache/commons/fileupload
-Note: Tomcat's copy of fileupload also includes classes copied manually (rather
- than svn copied) from Commons IO.
+This used to be hosted in svn. All changes up to the point where FileUpload was
+migrated to git have been merged.
Codec
org.apache.tomcat.util.codec is copied from:
@@ -51,3 +53,11 @@ org.apache.tomcat.util.codec is copied f
Note: Only classes required for Base64 encoding/decoding. The rest are removed.
+GIT
+===
+
+Process TBD
+
+FileUpload
+Note: Tomcat's copy of fileupload also includes classes copied manually (rather
+ than svn copied) from Commons IO.
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
