From: markt <markt@13f79535-47bb-0310-9956-ffa450edef68>
Date: Sat, 15 Nov 2008 13:27:34 +0000 (+0000)
Subject: Add temp file to track diff status
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=36774fcbf29560ec34c6bf4799e8435cd8948378;p=tomcat7.0

Add temp file to track diff status

git-svn-id: https://svn.apache.org/repos/asf/tomcat/trunk@714253 13f79535-47bb-0310-9956-ffa450edef68
---

diff --git a/DIFF-STATUS.txt b/DIFF-STATUS.txt
new file mode 100644
index 000000000..a7447594d
--- /dev/null
+++ b/DIFF-STATUS.txt
@@ -0,0 +1,40 @@
+================================================================================
+ This file records the status of the ongoing diff of 6.0.x against trunk. The
+ purpose of the diff is to ensure that:
+  - all the changes to 6.0.x have also been made to trunk
+  - all appropriate changes from trunk are ported to 6.0.x
+  - the trunk change log is complete
+
+ As the diff progresses, all of the differences between 6.0.x and trunk will be
+ one of the following:
+  - merged into trunk/6.0.x as appropriate to eliminate the difference
+  - proposed for merge into 6.0.x
+  - added to the trunk change log
+================================================================================
+
+TODO
+====
+/bin
+/conf
+/java
+/native
+/res
+/test
+/webapps
+
+Note that larger directory structures, like java, will be broken down into
+smaller, more manageable chunks.
+
+In progress
+===========
+/        - markt
+
+
+Complete
+========
+None
+
+
+Issues
+======
+None
\ No newline at end of file