tomcat-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ma...@apache.org
Subject [tomcat] branch master updated: Update merge info after remaining Commons projects migrated to git
Date Fri, 03 May 2019 13:10:37 GMT
This is an automated email from the ASF dual-hosted git repository.

markt pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/tomcat.git


The following commit(s) were added to refs/heads/master by this push:
     new a10ec6e  Update merge info after remaining Commons projects migrated to git
a10ec6e is described below

commit a10ec6ed60d5b0f6a7e0f2d9a96b4301345dbc77
Author: Mark Thomas <markt@apache.org>
AuthorDate: Fri May 3 14:10:00 2019 +0100

    Update merge info after remaining Commons projects migrated to git
---
 MERGE.txt | 34 ++++++++++++++--------------------
 1 file changed, 14 insertions(+), 20 deletions(-)

diff --git a/MERGE.txt b/MERGE.txt
index bd78baf..9fb1040 100644
--- a/MERGE.txt
+++ b/MERGE.txt
@@ -22,36 +22,30 @@ ideal. These include:
 - a large JAR where Tomcat only depends on a small fraction
 
 
-SVN
+GIT
 ===
 
-For sources hosted in svn the approach 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.
+Updates from Git are applied manually via patch files. Patch files are generated
+using:
+git diff <last SHA1>:<sub-tree> HEAD:<sub-tree> > temp.patch
+The most recently merged SHA1 for the component below should be updated after
+the patch file has been applied and committed
 
 BCEL
 ----
-org.apache.tomcat.util.bcel is copied from:
-/commons/proper/bcel/trunk/src/main/java/org/apache/bcel
+Sub-tree:
+src/main/java/org/apache/bcel
+The SHA1 ID for the most recent commit to be merged to Tomcat is:
+0b486d19a5f923b32c25806b380b592c61176819
 
 Codec
 -----
-org.apache.tomcat.util.codec is copied from:
-/commons/proper/codec/trunk/src/main/java/org/apache/commons/codec/
+Sub-tree:
+src/main/java/org/apache/commons/codec
+The SHA1 ID for the most recent commit to be merged to Tomcat is:
+163d643d1176e0dc9334ee83e21b9ce21d24fc1a
 Note: Only classes required for Base64 encoding/decoding. The rest are removed.
 
-
-GIT
-===
-
-Updates from Git are applied manually via patch files. Patch files are generated
-using:
-git diff <last SHA1>:<sub-tree> HEAD:<sub-tree> > temp.patch
-The most recently merged SHA1 for the component below should be updated after
-the patch file has been applied and committed
-
 FileUpload
 ----------
 Sub-tree:


---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@tomcat.apache.org
For additional commands, e-mail: dev-help@tomcat.apache.org


Mime
View raw message