update comments
diff --git a/scripts/e4_ui_prep.txt b/scripts/e4_ui_prep.txt
index d241262..6af4a8e 100644
--- a/scripts/e4_ui_prep.txt
+++ b/scripts/e4_ui_prep.txt
@@ -2,9 +2,10 @@
# we can do that with a much simpler command line
cvs rtag -D"07/28/2010 00:00" R4_0 e4/org.eclipse.e4.ui >tag40_log.txt 2>&1
+ # we use "06/21/2011 00:00" for R4_1
# R0_10 was applied to everything
# R4_1 was correctly applied
- # R0_10 was correctly applied
+ # R0_11 was correctly applied
# R4_1_maintenance was never branched in e4/org.eclipse.e4.ui
# R4_1_maintenance was branched but I think that needs to be converted by itself
@@ -12,128 +13,6 @@
-
-# run the retag script:
- ../../scripts/retag_cvs.sh modules_ui.sh R3_6 "06/04/2010 00:00" R3_6_maintenance >tag_pass1.sh
- grep ^cvs tag_pass1.sh >tag_fix1.sh
- #examine tag_fix1.sh and then run
- /bin/bash -x tag_fix1.sh
- #re-run retag script
- ../../scripts/retag_cvs.sh modules_ui.sh R3_6 "06/04/2010 00:00" R3_6_maintenance >tag_pass2.sh
-
-
-# Then fix the other tags. TAG1 is a known tag (like from above :-)
- ../../scripts/subtag_cvs.sh modules_ui.sh R3_6 R3_6_1 >subtag_pass1.sh
- grep ^cvs subtag_pass1.sh >subtag_fix1.sh
- #examine subtag_fix1.sh and then run
- /bin/bash -x subtag_fix1.sh
- #re-run subtag script to verify everybody is tagged
- ../../scripts/subtag_cvs.sh modules_ui.sh R3_6 R3_6_1 >subtag_pass2.sh
-
-#
-# you have to repeat the above for every tag/branch you care about
-#
- ../../scripts/subtag_cvs.sh modules_ui.sh R3_6_1 R3_6_2 >subtag_pass3.sh
- grep ^cvs subtag_pass3.sh >subtag_fix3.sh
- /bin/bash -x subtag_fix3.sh
-
- # do R3_5_maintenance
- ../../scripts/retag_cvs.sh modules_ui.sh R3_5 "06/05/2009 00:00" R3_5_maintenance >tag35_pass1.sh
- grep ^cvs tag35_pass1.sh >tag35_fix1.sh
- /bin/bash -x tag35_fix1.sh >log35_1.txt
- ../../scripts/retag_cvs.sh modules_ui.sh R3_5 "06/05/2009 00:00" R3_5_maintenance >tag35_pass2.sh
-
- # R3_5_1, R3_5_2
- ../../scripts/subtag_cvs.sh modules_ui.sh R3_5 R3_5_1 >sub35_pass1.sh
- grep ^cvs sub35_pass1.sh >sub35_fix1.sh
- /bin/bash -x sub35_fix1.sh
- ../../scripts/subtag_cvs.sh modules_ui.sh R3_5_1 R3_5_2 >sub35_pass2.sh
- grep ^cvs sub35_pass2.sh >sub35_fix2.sh
- /bin/bash -x sub35_fix2.sh
-
- # do R3_4_maintenance
- ../../scripts/retag_cvs.sh modules_ui.sh R3_4 "06/11/2008 00:00" R3_4_maintenance >tag34_pass1.sh
- grep ^cvs tag34_pass1.sh >tag34_fix1.sh
- /bin/bash -x tag34_fix1.sh
- ../../scripts/retag_cvs.sh modules_ui.sh R3_4 "06/11/2008 00:00" R3_4_maintenance >tag34_pass2.sh
-
- # do R3_4_1, R3_4_2
- ../../scripts/subtag_cvs.sh modules_ui.sh R3_4 R3_4_1 >sub34_pass1.sh
- grep ^cvs sub34_pass1.sh >sub34_fix1.sh
- # this says some random parts of org.eclipse.core.databinding.observable already tagged
- # W org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/list/ObservableList.java : R3_4_1 already exists on version 1.12.2.1 : NOT MOVING tag to version 1.12
- # W org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/AbstractObservableMap.java : R3_4_1 already exists on version 1.8.2.1 : NOT MOVING tag to version 1.8
- # W org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/map/ObservableMap.java : R3_4_1 already exists on version 1.7.4.1 : NOT MOVING tag to version 1.7
- # W org.eclipse.core.databinding.observable/src/org/eclipse/core/databinding/observable/set/ObservableSet.java : R3_4_1 already exists on version 1.6.2.1 : NOT MOVING tag to version 1.6
- # W org.eclipse.core.databinding.observable/src/org/eclipse/core/internal/databinding/observable/UnmodifiableObservableValue.java : R3_4_1 already exists on version 1.2.2.2 : NOT MOVING tag to version 1.2
- /bin/bash -x sub34_fix1.sh
-
- ../../scripts/subtag_cvs.sh modules_ui.sh R3_4_1 R3_4_2 >sub34_pass2.sh
- grep ^cvs sub34_pass2.sh >sub34_fix2.sh
- /bin/bash -x sub34_fix2.sh
-
- # do R3_3_maintenance
- ../../scripts/retag_cvs.sh modules_ui.sh R3_3 "06/14/2007 00:00" R3_3_maintenance >tag33_pass1.sh
- grep ^cvs tag33_pass1.sh >tag33_fix1.sh
- /bin/bash -x tag33_fix1.sh
-
- # do R3_3_1 and R3_3_2
- ../../scripts/subtag_cvs.sh modules_ui.sh R3_3 R3_3_1 >sub33_pass1.sh
- grep ^cvs sub33_pass1.sh >sub33_fix1.sh
- /bin/bash -x sub33_fix1.sh
- ../../scripts/subtag_cvs.sh modules_ui.sh R3_3_1 R3_3_2 >sub33_pass2.sh
- grep ^cvs sub33_pass2.sh >sub33_fix2.sh
- /bin/bash -x sub33_fix2.sh
-
- # do R3_2_maintenance
- ../../scripts/retag_cvs.sh modules_ui.sh R3_2 "06/06/2006 00:00" R3_2_maintenance >tag32_pass1.sh
- grep ^cvs tag32_pass1.sh >tag32_fix1.sh
- /bin/bash -x tag32_fix1.sh
-
- # R3_2_1, R3_2_2
- ../../scripts/subtag_cvs.sh modules_ui.sh R3_2 R3_2_1 >sub32_pass1.sh
- grep ^cvs sub32_pass1.sh >sub32_fix1.sh
- /bin/bash -x sub32_fix1.sh
- ../../scripts/subtag_cvs.sh modules_ui.sh R3_2_1 R3_2_2 >sub32_pass2.sh
- grep ^cvs sub32_pass2.sh >sub32_fix2.sh
- /bin/bash -x sub32_fix2.sh
-
- # do R3_1_maintenance
- ../../scripts/retag_cvs.sh modules_ui.sh R3_1 "06/28/2005 00:00" R3_1_maintenance >tag31_pass1.sh
- grep ^cvs tag31_pass1.sh >tag31_fix1.sh
- /bin/bash -x tag31_fix1.sh
-
- # do R3_1_1, R3_1_2
- ../../scripts/subtag_cvs.sh modules_ui.sh R3_1 R3_1_1 >sub31_pass1.sh
- grep ^cvs sub31_pass1.sh >sub31_fix1.sh
- /bin/bash -x sub31_fix1.sh
- ../../scripts/subtag_cvs.sh modules_ui.sh R3_1_1 R3_1_2 >sub31_pass2.sh
- grep ^cvs sub31_pass2.sh >sub31_fix2.sh
- /bin/bash -x sub31_fix2.sh
-
- # try R3_0_maintenance :-)
- ../../scripts/retag_cvs.sh modules_ui.sh R3_0 "06/25/2004 00:00" R3_0_maintenance >tag30_pass1.sh
- grep ^cvs tag30_pass1.sh >tag30_fix1.sh
- /bin/bash -x tag30_fix1.sh
-
- # do R3_0_1, R3_0_2
- ../../scripts/subtag_cvs.sh modules_ui.sh R3_0 R3_0_1 >sub30_pass1.sh
- grep ^cvs sub30_pass1.sh >sub30_fix1.sh
- /bin/bash -x sub30_fix1.sh
- ../../scripts/subtag_cvs.sh modules_ui.sh R3_0_1 R3_0_2 >sub30_pass2.sh
- grep ^cvs sub30_pass2.sh >sub30_fix2.sh
- /bin/bash -x sub30_fix2.sh
-
- # ooops, do R3_7_maintenance
- ../../scripts/retag_cvs.sh modules_ui.sh R3_7 "06/24/2011 00:00" R3_7_maintenance >tag37_pass1.sh
- grep ^cvs tag37_pass1.sh >tag37_fix1.sh
- /bin/bash -x tag37_fix1.sh
-
-
-
-
-
-
# create a local cvs root
# I did this on build.eclipse.org
mkdir cvsroot.eclipse.platform.ui