pass2 test of eclipse.platform.ui
diff --git a/eclipse.platform.ui/pass2/cvs2git.options b/eclipse.platform.ui/pass2/cvs2git.options
new file mode 100644
index 0000000..9f6148c
--- /dev/null
+++ b/eclipse.platform.ui/pass2/cvs2git.options
@@ -0,0 +1,683 @@
+# (Be in -*- mode: python; coding: utf-8 -*- mode.)
+#
+# ====================================================================
+# Copyright (c) 2006-2010 CollabNet.  All rights reserved.
+#
+# This software is licensed as described in the file COPYING, which
+# you should have received as part of this distribution.  The terms
+# are also available at http://subversion.tigris.org/license-1.html.
+# If newer versions of this license are posted there, you may use a
+# newer version instead, at your option.
+#
+# This software consists of voluntary contributions made by many
+# individuals.  For exact contribution history, see the revision
+# history and logs, available at http://cvs2svn.tigris.org/.
+# ====================================================================
+
+#                  #####################
+#                  ## PLEASE READ ME! ##
+#                  #####################
+#
+# This is a template for an options file that can be used to configure
+# cvs2svn to convert to git rather than to Subversion.  See
+# www/cvs2git.html and www/cvs2svn.html for general information, and
+# see the comments in this file for information about what options are
+# available and how they can be set.
+#
+# The program that is run to convert from CVS to git is called
+# cvs2git.  Run it with the --options option, passing it this file
+# like this:
+#
+#     cvs2git --options=cvs2git-example.options
+#
+# The output of cvs2git is a blob file and a dump file that can be
+# loaded into git using the "git fast-import" command.  Please read
+# www/cvs2git.html for more information.
+#
+# Many options do not have defaults, so it is easier to copy this file
+# and modify what you need rather than creating a new options file
+# from scratch.  This file is in Python syntax, but you don't need to
+# know Python to modify it.  But if you *do* know Python, then you
+# will be happy to know that you can use arbitary Python constructs to
+# do fancy configuration tricks.
+#
+# But please be aware of the following:
+#
+# * In many places, leading whitespace is significant in Python (it is
+#   used instead of curly braces to group statements together).
+#   Therefore, if you don't know what you are doing, it is best to
+#   leave the whitespace as it is.
+#
+# * In normal strings, Python treats a backslash ("\") as an escape
+#   character.  Therefore, if you want to specify a string that
+#   contains a backslash, you need either to escape the backslash with
+#   another backslash ("\\"), or use a "raw string", as in one if the
+#   following equivalent examples:
+#
+#       cvs_executable = 'c:\\windows\\system32\\cvs.exe'
+#       cvs_executable = r'c:\windows\system32\cvs.exe'
+#
+#   See http://docs.python.org/tutorial/introduction.html#strings for
+#   more information.
+#
+# Two identifiers will have been defined before this file is executed,
+# and can be used freely within this file:
+#
+#     ctx -- a Ctx object (see cvs2svn_lib/context.py), which holds
+#         many configuration options
+#
+#     run_options -- an instance of the GitRunOptions class (see
+#         cvs2svn_lib/git_run_options.py), which holds some variables
+#         governing how cvs2git is run
+
+
+# Import some modules that are used in setting the options:
+import os
+
+from cvs2svn_lib import config
+from cvs2svn_lib import changeset_database
+from cvs2svn_lib.common import CVSTextDecoder
+from cvs2svn_lib.log import logger
+from cvs2svn_lib.project import Project
+from cvs2svn_lib.git_revision_collector import GitRevisionCollector
+from cvs2svn_lib.external_blob_generator import ExternalBlobGenerator
+from cvs2svn_lib.git_output_option import GitRevisionMarkWriter
+from cvs2svn_lib.git_output_option import GitOutputOption
+from cvs2svn_lib.dvcs_common import KeywordHandlingPropertySetter
+from cvs2svn_lib.revision_manager import NullRevisionCollector
+from cvs2svn_lib.rcs_revision_manager import RCSRevisionReader
+from cvs2svn_lib.cvs_revision_manager import CVSRevisionReader
+from cvs2svn_lib.symbol_strategy import AllBranchRule
+from cvs2svn_lib.symbol_strategy import AllTagRule
+from cvs2svn_lib.symbol_strategy import BranchIfCommitsRule
+from cvs2svn_lib.symbol_strategy import ExcludeRegexpStrategyRule
+from cvs2svn_lib.symbol_strategy import ForceBranchRegexpStrategyRule
+from cvs2svn_lib.symbol_strategy import ForceTagRegexpStrategyRule
+from cvs2svn_lib.symbol_strategy import ExcludeTrivialImportBranchRule
+from cvs2svn_lib.symbol_strategy import ExcludeVendorBranchRule
+from cvs2svn_lib.symbol_strategy import HeuristicStrategyRule
+from cvs2svn_lib.symbol_strategy import UnambiguousUsageRule
+from cvs2svn_lib.symbol_strategy import HeuristicPreferredParentRule
+from cvs2svn_lib.symbol_strategy import SymbolHintsFileRule
+from cvs2svn_lib.symbol_transform import ReplaceSubstringsSymbolTransform
+from cvs2svn_lib.symbol_transform import RegexpSymbolTransform
+from cvs2svn_lib.symbol_transform import IgnoreSymbolTransform
+from cvs2svn_lib.symbol_transform import NormalizePathsSymbolTransform
+from cvs2svn_lib.property_setters import AutoPropsPropertySetter
+from cvs2svn_lib.property_setters import ConditionalPropertySetter
+from cvs2svn_lib.property_setters import cvs_file_is_binary
+from cvs2svn_lib.property_setters import CVSBinaryFileDefaultMimeTypeSetter
+from cvs2svn_lib.property_setters import CVSBinaryFileEOLStyleSetter
+from cvs2svn_lib.property_setters import DefaultEOLStyleSetter
+from cvs2svn_lib.property_setters import EOLStyleFromMimeTypeSetter
+from cvs2svn_lib.property_setters import ExecutablePropertySetter
+from cvs2svn_lib.property_setters import KeywordsPropertySetter
+from cvs2svn_lib.property_setters import MimeMapper
+from cvs2svn_lib.property_setters import SVNBinaryFileKeywordsPropertySetter
+
+# To choose the level of logging output, uncomment one of the
+# following lines:
+#logger.log_level = logger.WARN
+#logger.log_level = logger.QUIET
+logger.log_level = logger.NORMAL
+#logger.log_level = logger.VERBOSE
+#logger.log_level = logger.DEBUG
+
+
+# The directory to use for temporary files:
+ctx.tmpdir = r'cvs2svn-tmp'
+
+# During FilterSymbolsPass, cvs2git records the contents of file
+# revisions into a "blob" file in git-fast-import format.  The
+# ctx.revision_collector option configures that process.  Choose one of the two ersions and customize its options.
+
+# This first alternative is much slower but is better tested and has a
+# chance of working with CVSNT repositories.  It invokes CVS or RCS to
+# reconstuct the contents of CVS file revisions:
+#ctx.revision_collector = GitRevisionCollector(
+    # The file in which to write the git-fast-import stream that
+    # contains the file revision contents:
+#    'cvs2svn-tmp/git-blob.dat',
+
+    # The following option specifies how the revision contents of the
+    # RCS files should be read.
+    #
+    # RCSRevisionReader uses RCS's "co" program to extract the
+    # revision contents of the RCS files during CollectRevsPass.  The
+    # constructor argument specifies how to invoke the "co"
+    # executable.
+    #
+    # CVSRevisionReader uses the "cvs" program to extract the revision
+    # contents out of the RCS files during OutputPass.  This option is
+    # considerably slower than RCSRevisionReader because "cvs" is
+    # considerably slower than "co".  However, it works in some
+    # situations where RCSRevisionReader fails; see the HTML
+    # documentation of the "--use-cvs" option for details.  The
+    # constructor argument specifies how to invoke the "co"
+    # executable.
+    #
+    # Uncomment one of the two following lines:
+    #RCSRevisionReader(co_executable=r'co'),
+#    CVSRevisionReader(cvs_executable=r'cvs'),
+#    )
+# This second alternative is vastly faster than the version above.  It
+# uses an external Python program to reconstruct the contents of CVS
+# file revisions:
+ctx.revision_collector = ExternalBlobGenerator('cvs2svn-tmp/git-blob.dat')
+
+# cvs2git doesn't need a revision reader because OutputPass only
+# refers to blobs that were output during CollectRevsPass, so leave
+# this option set to None.
+ctx.revision_reader = None
+
+# Change the following line to True if the conversion should only
+# include the trunk of the repository (i.e., all branches and tags
+# should be omitted from the conversion):
+ctx.trunk_only = False
+
+# How to convert CVS author names, log messages, and filenames to
+# Unicode.  The first argument to CVSTextDecoder is a list of encoders
+# that are tried in order in 'strict' mode until one of them succeeds.
+# If none of those succeeds, then fallback_encoder (if it is
+# specified) is used in lossy 'replace' mode.  Setting a fallback
+# encoder ensures that the encoder always succeeds, but it can cause
+# information loss.
+ctx.cvs_author_decoder = CVSTextDecoder(
+    [
+        'utf8',
+        'latin1',
+        'ascii',
+        ],
+    #fallback_encoding='ascii'
+    )
+ctx.cvs_log_decoder = CVSTextDecoder(
+    [
+        'utf8',
+        'latin1',
+        'ascii',
+        ],
+    #fallback_encoding='ascii',
+    eol_fix='\n',
+    )
+# You might want to be especially strict when converting filenames to
+# Unicode (e.g., maybe not specify a fallback_encoding).
+ctx.cvs_filename_decoder = CVSTextDecoder(
+    [
+        #'utf8',
+        #'latin1',
+        'ascii',
+        ],
+    #fallback_encoding='ascii'
+    )
+
+# Template for the commit message to be used for initial project
+# commits.
+ctx.initial_project_commit_message = (
+    'Standard project directories initialized by cvs2svn.'
+    )
+
+# Template for the commit message to be used for post commits, in
+# which modifications to a vendor branch are copied back to trunk.
+# This message can use '%(revnum)d' to include the SVN revision number
+# of the revision that included the change to the vendor branch
+# (admittedly rather pointless in a cvs2git conversion).
+ctx.post_commit_message = (
+    'This commit was generated by cvs2svn to track changes on a CVS '
+    'vendor branch.'
+    )
+
+# Template for the commit message to be used for commits in which
+# symbols are created.  This message can use '%(symbol_type)s' to
+# include the type of the symbol ('branch' or 'tag') or
+# '%(symbol_name)s' to include the name of the symbol.
+ctx.symbol_commit_message = (
+    "This commit was manufactured by cvs2svn to create %(symbol_type)s "
+    "'%(symbol_name)s'."
+    )
+
+# Template for the commit message to be used for commits in which
+# tags are pseudo-merged back to their source branch.  This message can
+# use '%(symbol_name)s' to include the name of the symbol.
+# (Not used by default unless you enable tie_tag_fixup_branches on
+# GitOutputOption.)
+ctx.tie_tag_ancestry_message = (
+    "This commit was manufactured by cvs2svn to tie ancestry for "
+    "tag '%(symbol_name)s' back to the source branch."
+    )
+
+# Some CVS clients for MacOS store resource fork data into CVS along
+# with the file contents itself by wrapping it all up in a container
+# format called "AppleSingle".  Subversion currently does not support
+# MacOS resource forks.  Nevertheless, sometimes the resource fork
+# information is not necessary and can be discarded.  Set the
+# following option to True if you would like cvs2svn to identify files
+# whose contents are encoded in AppleSingle format, and discard all
+# but the data fork for such files before committing them to
+# Subversion.  (Please note that AppleSingle contents are identified
+# by the AppleSingle magic number as the first four bytes of the file.
+# This check is not failproof, so only set this option if you think
+# you need it.)
+ctx.decode_apple_single = False
+
+# This option can be set to the name of a filename to which are stored
+# statistics and conversion decisions about the CVS symbols.
+#ctx.symbol_info_filename = None
+ctx.symbol_info_filename = 'symbol-info.txt'
+
+# cvs2svn uses "symbol strategy rules" to help decide how to handle
+# CVS symbols.  The rules in a project's symbol_strategy_rules are
+# applied in order, and each rule is allowed to modify the symbol.
+# The result (after each of the rules has been applied) is used for
+# the conversion.
+#
+# 1. A CVS symbol might be used as a tag in one file and as a branch
+#    in another file.  cvs2svn has to decide whether to convert such a
+#    symbol as a tag or as a branch.  cvs2svn uses a series of
+#    heuristic rules to decide how to convert a symbol.  The user can
+#    override the default rules for specific symbols or symbols
+#    matching regular expressions.
+#
+# 2. cvs2svn is also capable of excluding symbols from the conversion
+#    (provided no other symbols depend on them.
+#
+# 3. CVS does not record unambiguously the line of development from
+#    which a symbol sprouted.  cvs2svn uses a heuristic to choose a
+#    symbol's "preferred parents".
+#
+# The standard branch/tag/exclude StrategyRules do not change a symbol
+# that has already been processed by an earlier rule, so in effect the
+# first matching rule is the one that is used.
+
+global_symbol_strategy_rules = [
+    # It is possible to specify manually exactly how symbols should be
+    # converted and what line of development should be used as the
+    # preferred parent.  To do so, create a file containing the symbol
+    # hints and enable the following option.
+    #
+    # The format of the hints file is described in the documentation
+    # for the --symbol-hints command-line option.  The file output by
+    # the --write-symbol-info (i.e., ctx.symbol_info_filename) option
+    # is in the same format.  The simplest way to use this option is
+    # to run the conversion through CollateSymbolsPass with
+    # --write-symbol-info option, copy the symbol info and edit it to
+    # create a hints file, then re-start the conversion at
+    # CollateSymbolsPass with this option enabled.
+    #SymbolHintsFileRule('symbol-hints2.txt'),
+
+    # To force all symbols matching a regular expression to be
+    # converted as branches, add rules like the following:
+    #ForceBranchRegexpStrategyRule(r'branch.*'),
+
+    # To force all symbols matching a regular expression to be
+    # converted as tags, add rules like the following:
+    #ForceTagRegexpStrategyRule(r'tag.*'),
+
+    # To force all symbols matching a regular expression to be
+    # excluded from the conversion, add rules like the following:
+    #ExcludeRegexpStrategyRule(r'unknown-.*'),
+
+    # Sometimes people use "cvs import" to get their own source code
+    # into CVS.  This practice creates a vendor branch 1.1.1 and
+    # imports the code onto the vendor branch as 1.1.1.1, then copies
+    # the same content to the trunk as version 1.1.  Normally, such
+    # vendor branches are useless and they complicate the SVN history
+    # unnecessarily.  The following rule excludes any branches that
+    # only existed as a vendor branch with a single import (leaving
+    # only the 1.1 revision).  If you want to retain such branches,
+    # comment out the following line.  (Please note that this rule
+    # does not exclude vendor *tags*, as they are not so easy to
+    # identify.)
+    ExcludeTrivialImportBranchRule(),
+
+    # To exclude all vendor branches (branches that had "cvs import"s
+    # on them but no other kinds of commits), uncomment the following
+    # line:
+    #ExcludeVendorBranchRule(),
+
+    # Usually you want this rule, to convert unambiguous symbols
+    # (symbols that were only ever used as tags or only ever used as
+    # branches in CVS) the same way they were used in CVS:
+    UnambiguousUsageRule(),
+
+    # If there was ever a commit on a symbol, then it cannot be
+    # converted as a tag.  This rule causes all such symbols to be
+    # converted as branches.  If you would like to resolve such
+    # ambiguities manually, comment out the following line:
+    BranchIfCommitsRule(),
+
+    # Last in the list can be a catch-all rule that is used for
+    # symbols that were not matched by any of the more specific rules
+    # above.  (Assuming that BranchIfCommitsRule() was included above,
+    # then the symbols that are still indeterminate at this point can
+    # sensibly be converted as branches or tags.)  Include at most one
+    # of these lines.  If none of these catch-all rules are included,
+    # then the presence of any ambiguous symbols (that haven't been
+    # disambiguated above) is an error:
+
+    # Convert ambiguous symbols based on whether they were used more
+    # often as branches or as tags:
+    HeuristicStrategyRule(),
+    # Convert all ambiguous symbols as branches:
+    #AllBranchRule(),
+    # Convert all ambiguous symbols as tags:
+    #AllTagRule(),
+
+    # The last rule is here to choose the preferred parent of branches
+    # and tags, that is, the line of development from which the symbol
+    # sprouts.
+    HeuristicPreferredParentRule(),
+    ]
+
+# Specify a username to be used for commits for which CVS doesn't
+# record the original author (for example, the creation of a branch).
+# This should be a simple (unix-style) username, but it can be
+# translated into a git-style name by the author_transforms map.
+ctx.username = 'cvs2svn'
+
+# ctx.file_property_setters and ctx.revision_property_setters contain
+# rules used to set the svn properties on files in the converted
+# archive.  For each file, the rules are tried one by one.  Any rule
+# can add or suppress one or more svn properties.  Typically the rules
+# will not overwrite properties set by a previous rule (though they
+# are free to do so).  ctx.file_property_setters should be used for
+# properties that remain the same for the life of the file; these
+# should implement FilePropertySetter.  ctx.revision_property_setters
+# should be used for properties that are allowed to vary from revision
+# to revision; these should implement RevisionPropertySetter.
+#
+# Obviously, SVN properties per se are not interesting for a cvs2git
+# conversion, but some of these properties have side-effects that do
+# affect the git output.  FIXME: Document this in more detail.
+ctx.file_property_setters.extend([
+    # To read auto-props rules from a file, uncomment the following line
+    # and specify a filename.  The boolean argument specifies whether
+    # case should be ignored when matching filenames to the filename
+    # patterns found in the auto-props file:
+    #AutoPropsPropertySetter(
+    #    r'/home/username/.subversion/config',
+    #    ignore_case=True,
+    #    ),
+
+    # To read mime types from a file and use them to set svn:mime-type
+    # based on the filename extensions, uncomment the following line
+    # and specify a filename (see
+    # http://en.wikipedia.org/wiki/Mime.types for information about
+    # mime.types files):
+    #MimeMapper(r'/etc/mime.types', ignore_case=False),
+
+    # Omit the svn:eol-style property from any files that are listed
+    # as binary (i.e., mode '-kb') in CVS:
+    CVSBinaryFileEOLStyleSetter(),
+
+    # If the file is binary and its svn:mime-type property is not yet
+    # set, set svn:mime-type to 'application/octet-stream'.
+    CVSBinaryFileDefaultMimeTypeSetter(),
+
+    # To try to determine the eol-style from the mime type, uncomment
+    # the following line:
+    #EOLStyleFromMimeTypeSetter(),
+
+    # Choose one of the following lines to set the default
+    # svn:eol-style if none of the above rules applied.  The argument
+    # is the svn:eol-style that should be applied, or None if no
+    # svn:eol-style should be set (i.e., the file should be treated as
+    # binary).
+    #
+    # The default is to treat all files as binary unless one of the
+    # previous rules has determined otherwise, because this is the
+    # safest approach.  However, if you have been diligent about
+    # marking binary files with -kb in CVS and/or you have used the
+    # above rules to definitely mark binary files as binary, then you
+    # might prefer to use 'native' as the default, as it is usually
+    # the most convenient setting for text files.  Other possible
+    # options: 'CRLF', 'CR', 'LF'.
+    DefaultEOLStyleSetter(None),
+    #DefaultEOLStyleSetter('native'),
+
+    # Prevent svn:keywords from being set on files that have
+    # svn:eol-style unset.
+    SVNBinaryFileKeywordsPropertySetter(),
+
+    # If svn:keywords has not been set yet, set it based on the file's
+    # CVS mode:
+    KeywordsPropertySetter(config.SVN_KEYWORDS_VALUE),
+
+    # Set the svn:executable flag on any files that are marked in CVS as
+    # being executable:
+    ExecutablePropertySetter(),
+
+    # The following causes keywords to be untouched in binary files and
+    # collapsed in all text to be committed:
+    ConditionalPropertySetter(
+        cvs_file_is_binary, KeywordHandlingPropertySetter('untouched'),
+        ),
+    KeywordHandlingPropertySetter('collapsed'),
+
+    ])
+ctx.revision_property_setters.extend([
+    ])
+
+# To skip the cleanup of temporary files, uncomment the following
+# option:
+ctx.skip_cleanup = True
+
+
+# In CVS, it is perfectly possible to make a single commit that
+# affects more than one project or more than one branch of a single
+# project.  Subversion also allows such commits.  Therefore, by
+# default, when cvs2svn sees what looks like a cross-project or
+# cross-branch CVS commit, it converts it into a
+# cross-project/cross-branch Subversion commit.
+#
+# However, other tools and SCMs have trouble representing
+# cross-project or cross-branch commits.  (For example, Trac's Revtree
+# plugin, http://www.trac-hacks.org/wiki/RevtreePlugin is confused by
+# such commits.)  Therefore, we provide the following two options to
+# allow cross-project/cross-branch commits to be suppressed.
+
+# cvs2git only supports single-project conversions (multiple-project
+# conversions wouldn't really make sense for git anyway).  So this
+# option must be set to False:
+ctx.cross_project_commits = False
+
+# git itself doesn't allow commits that affect more than one branch,
+# so this option must be set to False:
+ctx.cross_branch_commits = False
+
+# cvs2git does not yet handle translating .cvsignore files into
+# .gitignore files, so by default, the .cvsignore files are included
+# in the conversion output.  If you would like to omit the .cvsignore
+# files from the output, set this option to False:
+ctx.keep_cvsignore = True
+
+# By default, it is a fatal error for a CVS ",v" file to appear both
+# inside and outside of an "Attic" subdirectory (this should never
+# happen, but frequently occurs due to botched repository
+# administration).  If you would like to retain both versions of such
+# files, change the following option to True, and the attic version of
+# the file will be written to a subdirectory called "Attic" in the
+# output repository:
+ctx.retain_conflicting_attic_files = False
+
+# CVS uses unix login names as author names whereas git requires
+# author names to be of the form "foo <bar>".  The default is to set
+# the git author to "cvsauthor <cvsauthor>".  author_transforms can be
+# used to map cvsauthor names (e.g., "jrandom") to a true name and
+# email address (e.g., "J. Random <jrandom@example.com>" for the
+# example shown).  All strings should be either Unicode strings (i.e.,
+# with "u" as a prefix) or 8-bit strings in the utf-8 encoding.  The
+# values can either be strings in the form "name <email>" or tuples
+# (name, email).  Please substitute your own project's usernames here
+# to use with the author_transforms option of GitOutputOption below.
+author_transforms={
+
+'ahunter' : ('Anthony Hunter', 'ahunter@eclipse.org'),
+'airvine' : ('airvine', 'airvine@eclipse.org'),
+'aniefer' : ('Andrew Niefer', 'aniefer@eclipse.org'),
+'aweinand' : ('aweinand', 'aweinand@eclipse.org'),
+'bbiggs' : ('bbiggs', 'bbiggs@eclipse.org'),
+'bbokowski' : ('Boris Bokowski', 'bbokowski@eclipse.org'),
+'bcabe' : ('Benjamin Cabe', 'bcabe@eclipse.org'),
+'bdealwis' : ('Brian Dealwis', 'bdealwis@eclipse.org'),
+'breynolds' : ('breynolds', 'breynolds@eclipse.org'),
+'cdaniel' : ('Krzysztof Daniel', 'cdaniel@eclipse.org'),
+'cknaus' : ('cknaus', 'cknaus@eclipse.org'),
+'cmclaren' : ('cmclaren', 'cmclaren@eclipse.org'),
+'darins' : ('darins', 'darins@eclipse.org'),
+'davids' : ('davids', 'davids@eclipse.org'),
+'dejan' : ('dejan', 'dejan@eclipse.org'),
+'dmegert' : ('Dani Megert', 'dmegert@eclipse.org'),
+'dorme' : ('Dave Orme', 'dorme@eclipse.org'),
+'dpollock' : ('dpollock', 'dpollock@eclipse.org'),
+'droberts' : ('Dean Roberts', 'droberts@eclipse.org'),
+'dwilson' : ('dwilson', 'dwilson@eclipse.org'),
+'ebb' : ('Ed Burnette', 'ebb@eclipse.org'),
+'eduardo' : ('eduardo', 'eduardo@eclipse.org'),
+'eidsness' : ('eidsness', 'eidsness@eclipse.org'),
+'emoffatt' : ('Eric Moffatt', 'emoffatt@eclipse.org'),
+'fuptoniv' : ('Francis Upton IV', 'fuptoniv@eclipse.org'),
+'gheorghe' : ('Bogdan Gheorghe', 'gheorghe@eclipse.org'),
+'gmendel' : ('gmendel', 'gmendel@eclipse.org'),
+'gunnar' : ('Gunnar Wagenknecht', 'gunnar@eclipse.org'),
+'hsoliwal' : ('Hitesh Soliwal', 'hsoliwal@eclipse.org'),
+'ikhelifi' : ('ikhelifi', 'ikhelifi@eclipse.org'),
+'jeem' : ('jeem', 'jeem@eclipse.org'),
+'jlebrun' : ('jlebrun', 'jlebrun@eclipse.org'),
+'jlemieux' : ('jlemieux', 'jlemieux@eclipse.org'),
+'johna' : ('John Arthorne', 'johna@eclipse.org'),
+'karice' : ('Karice McIntyre', 'karice@eclipse.org'),
+'kevinh' : ('kevinh', 'kevinh@eclipse.org'),
+'kevinm' : ('kevinm', 'kevinm@eclipse.org'),
+'khorne' : ('khorne', 'khorne@eclipse.org'),
+'kmaetzel' : ('kmaetzel', 'kmaetzel@eclipse.org'),
+'kmoir' : ('Kim Moir', 'kmoir@eclipse.org'),
+'kradloff' : ('kradloff', 'kradloff@eclipse.org'),
+'ktoedter' : ('Kai Toedter', 'ktoedter@eclipse.org'),
+'lkues' : ('lkues', 'lkues@eclipse.org'),
+'marcelop' : ('Marcelo Paternostro', 'marcelop@eclipse.org'),
+'melder' : ('melder', 'melder@eclipse.org'),
+'mhall' : ('Matthew Hall', 'mhall@eclipse.org'),
+'mhatem' : ('mhatem', 'mhatem@eclipse.org'),
+'mkeller' : ('Markus Keller', 'mkeller@eclipse.org'),
+'mvalenta' : ('mvalenta', 'mvalenta@eclipse.org'),
+'mvanmeek' : ('mvanmeek', 'mvanmeek@eclipse.org'),
+'nick' : ('Nick Edgar', 'nick@eclipse.org'),
+'obesedin' : ('Oleg Besedin', 'obesedin@eclipse.org'),
+'omallo' : ('Ovidio Mallo', 'omallo@eclipse.org'),
+'prangaraj' : ('Prakash Rangaraj', 'prangaraj@eclipse.org'),
+'pwebster' : ('Paul Webster', 'pwebster@eclipse.org'),
+'randyg' : ('randyg', 'randyg@eclipse.org'),
+'rherrmann' : ('Rudiger Herrmann', 'rherrmann@eclipse.org'),
+'rsternber' : ('Ralf Sternberg', 'rsternber@eclipse.org'),
+'rsuen' : ('Remy Suen', 'rsuen@eclipse.org'),
+'sarsenau' : ('sarsenau', 'sarsenau@eclipse.org'),
+'sbeauchamp' : ('Serge Beauchamp', 'sbeauchamp@eclipse.org'),
+'sbrandys' : ('Szymon Brandys', 'sbrandys@eclipse.org'),
+'sdimitro' : ('Sonia Dimitrov', 'sdimitro@eclipse.org'),
+'sfranklin' : ('Susan McCourt', 'sfranklin@eclipse.org'),
+'sxenos' : ('sxenos', 'sxenos@eclipse.org'),
+'tod' : ('Tod Creasey', 'tod@eclipse.org'),
+'tschindl' : ('Thomas Schindl', 'tschindl@eclipse.org'),
+'wchoi' : ('wchoi', 'wchoi@eclipse.org'),
+'winchest' : ('winchest', 'winchest@eclipse.org'),
+'yvyang' : ('Yves YANG', 'yvyang@eclipse.org'),
+#    'jrandom' : ('J. Random', 'jrandom@example.com'),
+#    'mhagger' : 'Michael Haggerty <mhagger@alum.mit.edu>',
+#    'brane' : (u'Branko Äibej', 'brane@xbc.nu'),
+#    'ringstrom' : 'Tobias Ringström <tobias@ringstrom.mine.nu>',
+#    'dionisos' : (u'Erik Hülsmann', 'e.huelsmann@gmx.net'),
+
+    # This one will be used for commits for which CVS doesn't record
+    # the original author, as explained above.
+    'cvs2svn' : 'cvs2svn <platform-releng-dev@eclipse.org>',
+    }
+
+# This is the main option that causes cvs2svn to output to a
+# "fastimport"-format dumpfile rather than to Subversion:
+ctx.output_option = GitOutputOption(
+    # The file in which to write the git-fast-import stream that
+    # contains the changesets and branch/tag information:
+    os.path.join(ctx.tmpdir, 'git-dump.dat'),
+
+    # The blobs will be written via the revision recorder, so in
+    # OutputPass we only have to emit references to the blob marks:
+    GitRevisionMarkWriter(),
+
+    # Optional map from CVS author names to git author names:
+    author_transforms=author_transforms,
+    )
+
+# Change this option to True to turn on profiling of cvs2svn (for
+# debugging purposes):
+run_options.profiling = False
+
+
+# Should CVSItem -> Changeset database files be memory mapped?  In
+# some tests, using memory mapping speeded up the overall conversion
+# by about 5%.  But this option can cause the conversion to fail with
+# an out of memory error if the conversion computer runs out of
+# virtual address space (e.g., when running a very large conversion on
+# a 32-bit operating system).  Therefore it is disabled by default.
+# Uncomment the following line to allow these database files to be
+# memory mapped.
+changeset_database.use_mmap_for_cvs_item_to_changeset_table = True
+
+# Now set the project to be converted to git.  cvs2git only supports
+# single-project conversions, so this method must only be called
+# once:
+run_options.set_project(
+    # The filesystem path to the part of the CVS repository (*not* a
+    # CVS working copy) that should be converted.  This may be a
+    # subdirectory (i.e., a module) within a larger CVS repository.
+    r'/shared/eclipse/e4/git/cvs/cvsroot.eclipse.platform.ui/eclipse.platform.ui',
+
+    # A list of symbol transformations that can be used to rename
+    # symbols in this project.
+    symbol_transforms=[
+        # Use IgnoreSymbolTransforms like the following to completely
+        # ignore symbols matching a regular expression when parsing
+        # the CVS repository, for example to avoid warnings about
+        # branches with two names and to choose the preferred name.
+        # It is *not* recommended to use this instead of
+        # ExcludeRegexpStrategyRule; though more efficient,
+        # IgnoreSymbolTransforms are less flexible and don't exclude
+        # branches correctly.  The argument is a Python-style regular
+        # expression that has to match the *whole* CVS symbol name:
+        #IgnoreSymbolTransform(r'nightly-build-tag-.*')
+
+        # RegexpSymbolTransforms transform symbols textually using a
+        # regular expression.  The first argument is a Python regular
+        # expression pattern and the second is a replacement pattern.
+        # The pattern is matched against each symbol name.  If it
+        # matches the whole symbol name, then the symbol name is
+        # replaced with the corresponding replacement text.  The
+        # replacement can include substitution patterns (e.g., r'\1'
+        # or r'\g<name>').  Typically you will want to use raw strings
+        # (strings with a preceding 'r', like shown in the examples)
+        # for the regexp and its replacement to avoid backslash
+        # substitution within those strings.
+        #RegexpSymbolTransform(r'release-(\d+)_(\d+)',
+        #                      r'release-\1.\2'),
+        #RegexpSymbolTransform(r'release-(\d+)_(\d+)_(\d+)',
+        #                      r'release-\1.\2.\3'),
+
+        # Simple 1:1 character replacements can also be done.  The
+        # following transform, which converts backslashes into forward
+        # slashes, should usually be included:
+        ReplaceSubstringsSymbolTransform('\\','/'),
+
+        # This last rule eliminates leading, trailing, and repeated
+        # slashes within the output symbol names:
+        NormalizePathsSymbolTransform(),
+        ],
+
+    # See the definition of global_symbol_strategy_rules above for a
+    # description of this option:
+    symbol_strategy_rules=global_symbol_strategy_rules,
+
+    # Exclude paths from the conversion. Should be relative to
+    # repository path and use forward slashes:
+    #exclude_paths=['file-to-exclude.txt,v', 'dir/to/exclude'],
+    )
+
+
diff --git a/eclipse.platform.ui/pass2/fix_sub33.sh b/eclipse.platform.ui/pass2/fix_sub33.sh
new file mode 100644
index 0000000..cac7192
--- /dev/null
+++ b/eclipse.platform.ui/pass2/fix_sub33.sh
@@ -0,0 +1,15 @@
+cvs rtag -d R3_3 org.eclipse.core.databinding.observable
+cvs rtag -d R3_3 org.eclipse.core.databinding.property
+cvs rtag -d R3_3 org.eclipse.jface.tests.databinding.conformance
+cvs rtag -d R3_3 org.eclipse.ui.cocoa
+cvs rtag -d R3_3 org.eclipse.ui.tests.forms
+cvs rtag -d R3_3_1 org.eclipse.core.databinding.observable
+cvs rtag -d R3_3_1 org.eclipse.core.databinding.property
+cvs rtag -d R3_3_1 org.eclipse.jface.tests.databinding.conformance
+cvs rtag -d R3_3_1 org.eclipse.ui.cocoa
+cvs rtag -d R3_3_1 org.eclipse.ui.tests.forms
+cvs rtag -d R3_3_2 org.eclipse.core.databinding.observable
+cvs rtag -d R3_3_2 org.eclipse.core.databinding.property
+cvs rtag -d R3_3_2 org.eclipse.jface.tests.databinding.conformance
+cvs rtag -d R3_3_2 org.eclipse.ui.cocoa
+cvs rtag -d R3_3_2 org.eclipse.ui.tests.forms
diff --git a/eclipse.platform.ui/pass2/fix_sub34.sh b/eclipse.platform.ui/pass2/fix_sub34.sh
new file mode 100644
index 0000000..030f9ab
--- /dev/null
+++ b/eclipse.platform.ui/pass2/fix_sub34.sh
@@ -0,0 +1,10 @@
+cvs rtag -d R3_4 org.eclipse.core.databinding.observable
+cvs rtag -d R3_4 org.eclipse.ui.cocoa
+cvs rtag -d R3_4 org.eclipse.core.databinding.property
+cvs rtag -d R3_4_1 org.eclipse.core.databinding.observable
+cvs rtag -d R3_4_1 org.eclipse.core.databinding.property
+cvs rtag -d R3_4_1 org.eclipse.ui.cocoa
+cvs rtag -d R3_4_2 org.eclipse.core.databinding.observable
+cvs rtag -d R3_4_2 org.eclipse.core.databinding.property
+cvs rtag -d R3_4_2 org.eclipse.ui.cocoa
+
diff --git a/eclipse.platform.ui/pass2/modules_ui.sh b/eclipse.platform.ui/pass2/modules_ui.sh
new file mode 100644
index 0000000..7624ed9
--- /dev/null
+++ b/eclipse.platform.ui/pass2/modules_ui.sh
@@ -0,0 +1,65 @@
+
+MODULES='org.eclipse.core.commands
+org.eclipse.core.databinding
+org.eclipse.core.databinding.beans
+org.eclipse.core.databinding.observable
+org.eclipse.core.databinding.property
+org.eclipse.jface
+org.eclipse.jface.databinding
+org.eclipse.jface.examples.databinding
+org.eclipse.jface.snippets
+org.eclipse.jface.tests.databinding
+org.eclipse.jface.tests.databinding.conformance
+org.eclipse.ui
+org.eclipse.ui.carbon
+org.eclipse.ui.cocoa
+org.eclipse.ui.examples.contributions
+org.eclipse.ui.examples.fieldassist
+org.eclipse.ui.examples.multipageeditor
+org.eclipse.ui.examples.navigator
+org.eclipse.ui.examples.propertysheet
+org.eclipse.ui.examples.presentation
+org.eclipse.ui.examples.rcp.browser
+org.eclipse.ui.examples.readmetool
+org.eclipse.ui.examples.undo
+org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+org.eclipse.ui.ide
+org.eclipse.ui.ide.application
+org.eclipse.ui.navigator
+org.eclipse.ui.navigator.resources
+org.eclipse.ui.presentations.r21
+org.eclipse.ui.tests
+org.eclipse.ui.tests.harness
+org.eclipse.ui.tests.navigator
+org.eclipse.ui.tests.performance
+org.eclipse.ui.tests.rcp
+org.eclipse.ui.tests.views.properties.tabbed
+org.eclipse.ui.views
+org.eclipse.ui.views.properties.tabbed
+org.eclipse.ui.win32
+org.eclipse.ui.workbench
+org.eclipse.ui.workbench.compatibility
+
+org.eclipse.ui.browser
+org.eclipse.ui.examples.job
+org.eclipse.ui.forms
+org.eclipse.ui.forms.examples
+org.eclipse.ui.tests.browser
+org.eclipse.ui.tests.forms
+org.eclipse.ui.tutorials.rcp.part1
+org.eclipse.ui.tutorials.rcp.part2
+org.eclipse.ui.tutorials.rcp.part3
+
+'
+
+# legacy projects I won't move
+# org.eclipse.core.components
+# org.eclipse.ui.examples.components
+# org.eclipse.ui.internal.r21presentation
+# org.eclipse.jface.databinding.beans
+# org.eclipse.jface.databinding.ui
+# org.eclipse.ui.versioncheck
+
+
diff --git a/eclipse.platform.ui/pass2/sub30_fix1.sh b/eclipse.platform.ui/pass2/sub30_fix1.sh
new file mode 100644
index 0000000..3fca945
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub30_fix1.sh
@@ -0,0 +1,6 @@
+cvs rtag -R -rR3_0 R3_0_1 org.eclipse.ui.examples.rcp.browser
+cvs rtag -R -rR3_0 R3_0_1 org.eclipse.ui.examples.job
+cvs rtag -R -rR3_0 R3_0_1 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_0 R3_0_1 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_0 R3_0_1 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_0 R3_0_1 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub30_fix2.sh b/eclipse.platform.ui/pass2/sub30_fix2.sh
new file mode 100644
index 0000000..d4bb7e8
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub30_fix2.sh
@@ -0,0 +1,6 @@
+cvs rtag -R -rR3_0_1 R3_0_2 org.eclipse.ui.examples.rcp.browser
+cvs rtag -R -rR3_0_1 R3_0_2 org.eclipse.ui.examples.job
+cvs rtag -R -rR3_0_1 R3_0_2 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_0_1 R3_0_2 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_0_1 R3_0_2 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_0_1 R3_0_2 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub30_pass1.sh b/eclipse.platform.ui/pass2/sub30_pass1.sh
new file mode 100644
index 0000000..a5263a9
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub30_pass1.sh
@@ -0,0 +1,51 @@
+Module org.eclipse.core.commands empty or not tagged, skipping
+Module org.eclipse.core.databinding empty or not tagged, skipping
+Module org.eclipse.core.databinding.beans empty or not tagged, skipping
+Module org.eclipse.core.databinding.observable empty or not tagged, skipping
+Module org.eclipse.core.databinding.property empty or not tagged, skipping
+Already tagged R3_0_1 org.eclipse.jface
+Module org.eclipse.jface.databinding empty or not tagged, skipping
+Module org.eclipse.jface.examples.databinding empty or not tagged, skipping
+Module org.eclipse.jface.snippets empty or not tagged, skipping
+Module org.eclipse.jface.tests.databinding empty or not tagged, skipping
+Module org.eclipse.jface.tests.databinding.conformance empty or not tagged, skipping
+Already tagged R3_0_1 org.eclipse.ui
+Already tagged R3_0_1 org.eclipse.ui.carbon
+Module org.eclipse.ui.cocoa empty or not tagged, skipping
+Module org.eclipse.ui.examples.contributions empty or not tagged, skipping
+Module org.eclipse.ui.examples.fieldassist empty or not tagged, skipping
+Already tagged R3_0_1 org.eclipse.ui.examples.multipageeditor
+Module org.eclipse.ui.examples.navigator empty or not tagged, skipping
+Already tagged R3_0_1 org.eclipse.ui.examples.propertysheet
+Module org.eclipse.ui.examples.presentation empty or not tagged, skipping
+cvs rtag -R -rR3_0 R3_0_1 org.eclipse.ui.examples.rcp.browser
+Already tagged R3_0_1 org.eclipse.ui.examples.readmetool
+Module org.eclipse.ui.examples.undo empty or not tagged, skipping
+Module org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article empty or not tagged, skipping
+Module org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague empty or not tagged, skipping
+Module org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic empty or not tagged, skipping
+Already tagged R3_0_1 org.eclipse.ui.ide
+Module org.eclipse.ui.ide.application empty or not tagged, skipping
+Module org.eclipse.ui.navigator empty or not tagged, skipping
+Module org.eclipse.ui.navigator.resources empty or not tagged, skipping
+Already tagged R3_0_1 org.eclipse.ui.presentations.r21
+Already tagged R3_0_1 org.eclipse.ui.tests
+Module org.eclipse.ui.tests.harness empty or not tagged, skipping
+Module org.eclipse.ui.tests.navigator empty or not tagged, skipping
+Module org.eclipse.ui.tests.performance empty or not tagged, skipping
+Module org.eclipse.ui.tests.rcp empty or not tagged, skipping
+Module org.eclipse.ui.tests.views.properties.tabbed empty or not tagged, skipping
+Already tagged R3_0_1 org.eclipse.ui.views
+Module org.eclipse.ui.views.properties.tabbed empty or not tagged, skipping
+Already tagged R3_0_1 org.eclipse.ui.win32
+Already tagged R3_0_1 org.eclipse.ui.workbench
+Already tagged R3_0_1 org.eclipse.ui.workbench.compatibility
+Module org.eclipse.ui.browser empty or not tagged, skipping
+cvs rtag -R -rR3_0 R3_0_1 org.eclipse.ui.examples.job
+Already tagged R3_0_1 org.eclipse.ui.forms
+cvs rtag -R -rR3_0 R3_0_1 org.eclipse.ui.forms.examples
+Module org.eclipse.ui.tests.browser empty or not tagged, skipping
+Module org.eclipse.ui.tests.forms empty or not tagged, skipping
+cvs rtag -R -rR3_0 R3_0_1 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_0 R3_0_1 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_0 R3_0_1 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub30_pass2.sh b/eclipse.platform.ui/pass2/sub30_pass2.sh
new file mode 100644
index 0000000..b1a82cb
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub30_pass2.sh
@@ -0,0 +1,51 @@
+Module org.eclipse.core.commands empty or not tagged, skipping
+Module org.eclipse.core.databinding empty or not tagged, skipping
+Module org.eclipse.core.databinding.beans empty or not tagged, skipping
+Module org.eclipse.core.databinding.observable empty or not tagged, skipping
+Module org.eclipse.core.databinding.property empty or not tagged, skipping
+Already tagged R3_0_2 org.eclipse.jface
+Module org.eclipse.jface.databinding empty or not tagged, skipping
+Module org.eclipse.jface.examples.databinding empty or not tagged, skipping
+Module org.eclipse.jface.snippets empty or not tagged, skipping
+Module org.eclipse.jface.tests.databinding empty or not tagged, skipping
+Module org.eclipse.jface.tests.databinding.conformance empty or not tagged, skipping
+Already tagged R3_0_2 org.eclipse.ui
+Already tagged R3_0_2 org.eclipse.ui.carbon
+Module org.eclipse.ui.cocoa empty or not tagged, skipping
+Module org.eclipse.ui.examples.contributions empty or not tagged, skipping
+Module org.eclipse.ui.examples.fieldassist empty or not tagged, skipping
+Already tagged R3_0_2 org.eclipse.ui.examples.multipageeditor
+Module org.eclipse.ui.examples.navigator empty or not tagged, skipping
+Already tagged R3_0_2 org.eclipse.ui.examples.propertysheet
+Module org.eclipse.ui.examples.presentation empty or not tagged, skipping
+cvs rtag -R -rR3_0_1 R3_0_2 org.eclipse.ui.examples.rcp.browser
+Already tagged R3_0_2 org.eclipse.ui.examples.readmetool
+Module org.eclipse.ui.examples.undo empty or not tagged, skipping
+Module org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article empty or not tagged, skipping
+Module org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague empty or not tagged, skipping
+Module org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic empty or not tagged, skipping
+Already tagged R3_0_2 org.eclipse.ui.ide
+Module org.eclipse.ui.ide.application empty or not tagged, skipping
+Module org.eclipse.ui.navigator empty or not tagged, skipping
+Module org.eclipse.ui.navigator.resources empty or not tagged, skipping
+Already tagged R3_0_2 org.eclipse.ui.presentations.r21
+Already tagged R3_0_2 org.eclipse.ui.tests
+Module org.eclipse.ui.tests.harness empty or not tagged, skipping
+Module org.eclipse.ui.tests.navigator empty or not tagged, skipping
+Module org.eclipse.ui.tests.performance empty or not tagged, skipping
+Module org.eclipse.ui.tests.rcp empty or not tagged, skipping
+Module org.eclipse.ui.tests.views.properties.tabbed empty or not tagged, skipping
+Already tagged R3_0_2 org.eclipse.ui.views
+Module org.eclipse.ui.views.properties.tabbed empty or not tagged, skipping
+Already tagged R3_0_2 org.eclipse.ui.win32
+Already tagged R3_0_2 org.eclipse.ui.workbench
+Already tagged R3_0_2 org.eclipse.ui.workbench.compatibility
+Module org.eclipse.ui.browser empty or not tagged, skipping
+cvs rtag -R -rR3_0_1 R3_0_2 org.eclipse.ui.examples.job
+Already tagged R3_0_2 org.eclipse.ui.forms
+cvs rtag -R -rR3_0_1 R3_0_2 org.eclipse.ui.forms.examples
+Module org.eclipse.ui.tests.browser empty or not tagged, skipping
+Module org.eclipse.ui.tests.forms empty or not tagged, skipping
+cvs rtag -R -rR3_0_1 R3_0_2 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_0_1 R3_0_2 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_0_1 R3_0_2 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub31_fix1.sh b/eclipse.platform.ui/pass2/sub31_fix1.sh
new file mode 100644
index 0000000..9568ee3
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub31_fix1.sh
@@ -0,0 +1,11 @@
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.examples.contributions
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.examples.navigator
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.examples.rcp.browser
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.navigator
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.examples.job
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.tests.browser
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub31_fix2.sh b/eclipse.platform.ui/pass2/sub31_fix2.sh
new file mode 100644
index 0000000..59c5254
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub31_fix2.sh
@@ -0,0 +1,11 @@
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.examples.contributions
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.examples.navigator
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.examples.rcp.browser
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.navigator
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.examples.job
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.tests.browser
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub31_pass1.sh b/eclipse.platform.ui/pass2/sub31_pass1.sh
new file mode 100644
index 0000000..463bcb4
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub31_pass1.sh
@@ -0,0 +1,51 @@
+Already tagged R3_1_1 org.eclipse.core.commands
+Module org.eclipse.core.databinding empty or not tagged, skipping
+Module org.eclipse.core.databinding.beans empty or not tagged, skipping
+Module org.eclipse.core.databinding.observable empty or not tagged, skipping
+Module org.eclipse.core.databinding.property empty or not tagged, skipping
+Already tagged R3_1_1 org.eclipse.jface
+Module org.eclipse.jface.databinding empty or not tagged, skipping
+Module org.eclipse.jface.examples.databinding empty or not tagged, skipping
+Module org.eclipse.jface.snippets empty or not tagged, skipping
+Module org.eclipse.jface.tests.databinding empty or not tagged, skipping
+Module org.eclipse.jface.tests.databinding.conformance empty or not tagged, skipping
+Already tagged R3_1_1 org.eclipse.ui
+Already tagged R3_1_1 org.eclipse.ui.carbon
+Module org.eclipse.ui.cocoa empty or not tagged, skipping
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.examples.contributions
+Module org.eclipse.ui.examples.fieldassist empty or not tagged, skipping
+Already tagged R3_1_1 org.eclipse.ui.examples.multipageeditor
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.examples.navigator
+Already tagged R3_1_1 org.eclipse.ui.examples.propertysheet
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.examples.rcp.browser
+Already tagged R3_1_1 org.eclipse.ui.examples.readmetool
+Already tagged R3_1_1 org.eclipse.ui.examples.undo
+Module org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article empty or not tagged, skipping
+Module org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague empty or not tagged, skipping
+Module org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic empty or not tagged, skipping
+Already tagged R3_1_1 org.eclipse.ui.ide
+Module org.eclipse.ui.ide.application empty or not tagged, skipping
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.navigator
+Module org.eclipse.ui.navigator.resources empty or not tagged, skipping
+Already tagged R3_1_1 org.eclipse.ui.presentations.r21
+Already tagged R3_1_1 org.eclipse.ui.tests
+Module org.eclipse.ui.tests.harness empty or not tagged, skipping
+Module org.eclipse.ui.tests.navigator empty or not tagged, skipping
+Module org.eclipse.ui.tests.performance empty or not tagged, skipping
+Already tagged R3_1_1 org.eclipse.ui.tests.rcp
+Module org.eclipse.ui.tests.views.properties.tabbed empty or not tagged, skipping
+Already tagged R3_1_1 org.eclipse.ui.views
+Module org.eclipse.ui.views.properties.tabbed empty or not tagged, skipping
+Already tagged R3_1_1 org.eclipse.ui.win32
+Already tagged R3_1_1 org.eclipse.ui.workbench
+Already tagged R3_1_1 org.eclipse.ui.workbench.compatibility
+Already tagged R3_1_1 org.eclipse.ui.browser
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.examples.job
+Already tagged R3_1_1 org.eclipse.ui.forms
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.tests.browser
+Module org.eclipse.ui.tests.forms empty or not tagged, skipping
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_1 R3_1_1 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub31_pass2.sh b/eclipse.platform.ui/pass2/sub31_pass2.sh
new file mode 100644
index 0000000..29f7b3f
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub31_pass2.sh
@@ -0,0 +1,51 @@
+Already tagged R3_1_2 org.eclipse.core.commands
+Module org.eclipse.core.databinding empty or not tagged, skipping
+Module org.eclipse.core.databinding.beans empty or not tagged, skipping
+Module org.eclipse.core.databinding.observable empty or not tagged, skipping
+Module org.eclipse.core.databinding.property empty or not tagged, skipping
+Already tagged R3_1_2 org.eclipse.jface
+Module org.eclipse.jface.databinding empty or not tagged, skipping
+Module org.eclipse.jface.examples.databinding empty or not tagged, skipping
+Module org.eclipse.jface.snippets empty or not tagged, skipping
+Module org.eclipse.jface.tests.databinding empty or not tagged, skipping
+Module org.eclipse.jface.tests.databinding.conformance empty or not tagged, skipping
+Already tagged R3_1_2 org.eclipse.ui
+Already tagged R3_1_2 org.eclipse.ui.carbon
+Module org.eclipse.ui.cocoa empty or not tagged, skipping
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.examples.contributions
+Module org.eclipse.ui.examples.fieldassist empty or not tagged, skipping
+Already tagged R3_1_2 org.eclipse.ui.examples.multipageeditor
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.examples.navigator
+Already tagged R3_1_2 org.eclipse.ui.examples.propertysheet
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.examples.rcp.browser
+Already tagged R3_1_2 org.eclipse.ui.examples.readmetool
+Already tagged R3_1_2 org.eclipse.ui.examples.undo
+Module org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article empty or not tagged, skipping
+Module org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague empty or not tagged, skipping
+Module org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic empty or not tagged, skipping
+Already tagged R3_1_2 org.eclipse.ui.ide
+Module org.eclipse.ui.ide.application empty or not tagged, skipping
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.navigator
+Module org.eclipse.ui.navigator.resources empty or not tagged, skipping
+Already tagged R3_1_2 org.eclipse.ui.presentations.r21
+Already tagged R3_1_2 org.eclipse.ui.tests
+Module org.eclipse.ui.tests.harness empty or not tagged, skipping
+Module org.eclipse.ui.tests.navigator empty or not tagged, skipping
+Module org.eclipse.ui.tests.performance empty or not tagged, skipping
+Already tagged R3_1_2 org.eclipse.ui.tests.rcp
+Module org.eclipse.ui.tests.views.properties.tabbed empty or not tagged, skipping
+Already tagged R3_1_2 org.eclipse.ui.views
+Module org.eclipse.ui.views.properties.tabbed empty or not tagged, skipping
+Module org.eclipse.ui.win32 empty or not tagged, skipping
+Already tagged R3_1_2 org.eclipse.ui.workbench
+Already tagged R3_1_2 org.eclipse.ui.workbench.compatibility
+Already tagged R3_1_2 org.eclipse.ui.browser
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.examples.job
+Already tagged R3_1_2 org.eclipse.ui.forms
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.tests.browser
+Module org.eclipse.ui.tests.forms empty or not tagged, skipping
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_1_1 R3_1_2 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub32_fix1.sh b/eclipse.platform.ui/pass2/sub32_fix1.sh
new file mode 100644
index 0000000..caccf92
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub32_fix1.sh
@@ -0,0 +1,11 @@
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.examples.contributions
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.examples.navigator
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.examples.rcp.browser
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.examples.job
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.tests.browser
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub32_fix2.sh b/eclipse.platform.ui/pass2/sub32_fix2.sh
new file mode 100644
index 0000000..9d728ae
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub32_fix2.sh
@@ -0,0 +1,11 @@
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.examples.contributions
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.examples.navigator
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.examples.rcp.browser
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.examples.job
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.tests.browser
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub32_pass1.sh b/eclipse.platform.ui/pass2/sub32_pass1.sh
new file mode 100644
index 0000000..19b0b61
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub32_pass1.sh
@@ -0,0 +1,51 @@
+Already tagged R3_2_1 org.eclipse.core.commands
+Module org.eclipse.core.databinding empty or not tagged, skipping
+Module org.eclipse.core.databinding.beans empty or not tagged, skipping
+Module org.eclipse.core.databinding.observable empty or not tagged, skipping
+Module org.eclipse.core.databinding.property empty or not tagged, skipping
+Already tagged R3_2_1 org.eclipse.jface
+Already tagged R3_2_1 org.eclipse.jface.databinding
+Already tagged R3_2_1 org.eclipse.jface.examples.databinding
+Module org.eclipse.jface.snippets empty or not tagged, skipping
+Already tagged R3_2_1 org.eclipse.jface.tests.databinding
+Module org.eclipse.jface.tests.databinding.conformance empty or not tagged, skipping
+Already tagged R3_2_1 org.eclipse.ui
+Already tagged R3_2_1 org.eclipse.ui.carbon
+Module org.eclipse.ui.cocoa empty or not tagged, skipping
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.examples.contributions
+Already tagged R3_2_1 org.eclipse.ui.examples.fieldassist
+Already tagged R3_2_1 org.eclipse.ui.examples.multipageeditor
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.examples.navigator
+Already tagged R3_2_1 org.eclipse.ui.examples.propertysheet
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.examples.rcp.browser
+Already tagged R3_2_1 org.eclipse.ui.examples.readmetool
+Already tagged R3_2_1 org.eclipse.ui.examples.undo
+Already tagged R3_2_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Already tagged R3_2_1 org.eclipse.ui.ide
+Module org.eclipse.ui.ide.application empty or not tagged, skipping
+Already tagged R3_2_1 org.eclipse.ui.navigator
+Already tagged R3_2_1 org.eclipse.ui.navigator.resources
+Already tagged R3_2_1 org.eclipse.ui.presentations.r21
+Already tagged R3_2_1 org.eclipse.ui.tests
+Already tagged R3_2_1 org.eclipse.ui.tests.harness
+Already tagged R3_2_1 org.eclipse.ui.tests.navigator
+Already tagged R3_2_1 org.eclipse.ui.tests.performance
+Already tagged R3_2_1 org.eclipse.ui.tests.rcp
+Already tagged R3_2_1 org.eclipse.ui.tests.views.properties.tabbed
+Already tagged R3_2_1 org.eclipse.ui.views
+Already tagged R3_2_1 org.eclipse.ui.views.properties.tabbed
+Already tagged R3_2_1 org.eclipse.ui.win32
+Already tagged R3_2_1 org.eclipse.ui.workbench
+Already tagged R3_2_1 org.eclipse.ui.workbench.compatibility
+Already tagged R3_2_1 org.eclipse.ui.browser
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.examples.job
+Already tagged R3_2_1 org.eclipse.ui.forms
+Already tagged R3_2_1 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.tests.browser
+Module org.eclipse.ui.tests.forms empty or not tagged, skipping
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_2 R3_2_1 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub32_pass2.sh b/eclipse.platform.ui/pass2/sub32_pass2.sh
new file mode 100644
index 0000000..93c45f3
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub32_pass2.sh
@@ -0,0 +1,51 @@
+Already tagged R3_2_2 org.eclipse.core.commands
+Module org.eclipse.core.databinding empty or not tagged, skipping
+Module org.eclipse.core.databinding.beans empty or not tagged, skipping
+Module org.eclipse.core.databinding.observable empty or not tagged, skipping
+Module org.eclipse.core.databinding.property empty or not tagged, skipping
+Already tagged R3_2_2 org.eclipse.jface
+Already tagged R3_2_2 org.eclipse.jface.databinding
+Already tagged R3_2_2 org.eclipse.jface.examples.databinding
+Module org.eclipse.jface.snippets empty or not tagged, skipping
+Already tagged R3_2_2 org.eclipse.jface.tests.databinding
+Module org.eclipse.jface.tests.databinding.conformance empty or not tagged, skipping
+Already tagged R3_2_2 org.eclipse.ui
+Already tagged R3_2_2 org.eclipse.ui.carbon
+Module org.eclipse.ui.cocoa empty or not tagged, skipping
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.examples.contributions
+Already tagged R3_2_2 org.eclipse.ui.examples.fieldassist
+Already tagged R3_2_2 org.eclipse.ui.examples.multipageeditor
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.examples.navigator
+Already tagged R3_2_2 org.eclipse.ui.examples.propertysheet
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.examples.rcp.browser
+Already tagged R3_2_2 org.eclipse.ui.examples.readmetool
+Already tagged R3_2_2 org.eclipse.ui.examples.undo
+Already tagged R3_2_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Already tagged R3_2_2 org.eclipse.ui.ide
+Module org.eclipse.ui.ide.application empty or not tagged, skipping
+Already tagged R3_2_2 org.eclipse.ui.navigator
+Already tagged R3_2_2 org.eclipse.ui.navigator.resources
+Already tagged R3_2_2 org.eclipse.ui.presentations.r21
+Already tagged R3_2_2 org.eclipse.ui.tests
+Already tagged R3_2_2 org.eclipse.ui.tests.harness
+Already tagged R3_2_2 org.eclipse.ui.tests.navigator
+Already tagged R3_2_2 org.eclipse.ui.tests.performance
+Already tagged R3_2_2 org.eclipse.ui.tests.rcp
+Already tagged R3_2_2 org.eclipse.ui.tests.views.properties.tabbed
+Already tagged R3_2_2 org.eclipse.ui.views
+Already tagged R3_2_2 org.eclipse.ui.views.properties.tabbed
+Already tagged R3_2_2 org.eclipse.ui.win32
+Already tagged R3_2_2 org.eclipse.ui.workbench
+Already tagged R3_2_2 org.eclipse.ui.workbench.compatibility
+Already tagged R3_2_2 org.eclipse.ui.browser
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.examples.job
+Already tagged R3_2_2 org.eclipse.ui.forms
+Already tagged R3_2_2 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.tests.browser
+Module org.eclipse.ui.tests.forms empty or not tagged, skipping
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_2_1 R3_2_2 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub33_fix1.sh b/eclipse.platform.ui/pass2/sub33_fix1.sh
new file mode 100644
index 0000000..8dde39b
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub33_fix1.sh
@@ -0,0 +1,12 @@
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.jface.snippets
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.examples.navigator
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.examples.rcp.browser
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.examples.job
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.tests.browser
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub33_fix2.sh b/eclipse.platform.ui/pass2/sub33_fix2.sh
new file mode 100644
index 0000000..64a5ca8
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub33_fix2.sh
@@ -0,0 +1,12 @@
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.jface.snippets
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.examples.navigator
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.examples.rcp.browser
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.examples.job
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.tests.browser
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub33_pass1.sh b/eclipse.platform.ui/pass2/sub33_pass1.sh
new file mode 100644
index 0000000..2497ed6
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub33_pass1.sh
@@ -0,0 +1,51 @@
+Already tagged R3_3_1 org.eclipse.core.commands
+Already tagged R3_3_1 org.eclipse.core.databinding
+Already tagged R3_3_1 org.eclipse.core.databinding.beans
+Module org.eclipse.core.databinding.observable empty or not tagged, skipping
+Module org.eclipse.core.databinding.property empty or not tagged, skipping
+Already tagged R3_3_1 org.eclipse.jface
+Already tagged R3_3_1 org.eclipse.jface.databinding
+Already tagged R3_3_1 org.eclipse.jface.examples.databinding
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.jface.snippets
+Already tagged R3_3_1 org.eclipse.jface.tests.databinding
+Module org.eclipse.jface.tests.databinding.conformance empty or not tagged, skipping
+Already tagged R3_3_1 org.eclipse.ui
+Already tagged R3_3_1 org.eclipse.ui.carbon
+Module org.eclipse.ui.cocoa empty or not tagged, skipping
+Already tagged R3_3_1 org.eclipse.ui.examples.contributions
+Already tagged R3_3_1 org.eclipse.ui.examples.fieldassist
+Already tagged R3_3_1 org.eclipse.ui.examples.multipageeditor
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.examples.navigator
+Already tagged R3_3_1 org.eclipse.ui.examples.propertysheet
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.examples.rcp.browser
+Already tagged R3_3_1 org.eclipse.ui.examples.readmetool
+Already tagged R3_3_1 org.eclipse.ui.examples.undo
+Already tagged R3_3_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Already tagged R3_3_1 org.eclipse.ui.ide
+Already tagged R3_3_1 org.eclipse.ui.ide.application
+Already tagged R3_3_1 org.eclipse.ui.navigator
+Already tagged R3_3_1 org.eclipse.ui.navigator.resources
+Already tagged R3_3_1 org.eclipse.ui.presentations.r21
+Already tagged R3_3_1 org.eclipse.ui.tests
+Already tagged R3_3_1 org.eclipse.ui.tests.harness
+Already tagged R3_3_1 org.eclipse.ui.tests.navigator
+Already tagged R3_3_1 org.eclipse.ui.tests.performance
+Already tagged R3_3_1 org.eclipse.ui.tests.rcp
+Already tagged R3_3_1 org.eclipse.ui.tests.views.properties.tabbed
+Already tagged R3_3_1 org.eclipse.ui.views
+Already tagged R3_3_1 org.eclipse.ui.views.properties.tabbed
+Already tagged R3_3_1 org.eclipse.ui.win32
+Already tagged R3_3_1 org.eclipse.ui.workbench
+Already tagged R3_3_1 org.eclipse.ui.workbench.compatibility
+Already tagged R3_3_1 org.eclipse.ui.browser
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.examples.job
+Already tagged R3_3_1 org.eclipse.ui.forms
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.tests.browser
+Module org.eclipse.ui.tests.forms empty or not tagged, skipping
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_3 R3_3_1 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub33_pass2.sh b/eclipse.platform.ui/pass2/sub33_pass2.sh
new file mode 100644
index 0000000..8fe955e
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub33_pass2.sh
@@ -0,0 +1,51 @@
+Already tagged R3_3_2 org.eclipse.core.commands
+Already tagged R3_3_2 org.eclipse.core.databinding
+Already tagged R3_3_2 org.eclipse.core.databinding.beans
+Module org.eclipse.core.databinding.observable empty or not tagged, skipping
+Module org.eclipse.core.databinding.property empty or not tagged, skipping
+Already tagged R3_3_2 org.eclipse.jface
+Already tagged R3_3_2 org.eclipse.jface.databinding
+Already tagged R3_3_2 org.eclipse.jface.examples.databinding
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.jface.snippets
+Already tagged R3_3_2 org.eclipse.jface.tests.databinding
+Module org.eclipse.jface.tests.databinding.conformance empty or not tagged, skipping
+Already tagged R3_3_2 org.eclipse.ui
+Already tagged R3_3_2 org.eclipse.ui.carbon
+Module org.eclipse.ui.cocoa empty or not tagged, skipping
+Already tagged R3_3_2 org.eclipse.ui.examples.contributions
+Already tagged R3_3_2 org.eclipse.ui.examples.fieldassist
+Already tagged R3_3_2 org.eclipse.ui.examples.multipageeditor
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.examples.navigator
+Already tagged R3_3_2 org.eclipse.ui.examples.propertysheet
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.examples.rcp.browser
+Already tagged R3_3_2 org.eclipse.ui.examples.readmetool
+Already tagged R3_3_2 org.eclipse.ui.examples.undo
+Already tagged R3_3_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Already tagged R3_3_2 org.eclipse.ui.ide
+Already tagged R3_3_2 org.eclipse.ui.ide.application
+Already tagged R3_3_2 org.eclipse.ui.navigator
+Already tagged R3_3_2 org.eclipse.ui.navigator.resources
+Already tagged R3_3_2 org.eclipse.ui.presentations.r21
+Already tagged R3_3_2 org.eclipse.ui.tests
+Already tagged R3_3_2 org.eclipse.ui.tests.harness
+Already tagged R3_3_2 org.eclipse.ui.tests.navigator
+Already tagged R3_3_2 org.eclipse.ui.tests.performance
+Already tagged R3_3_2 org.eclipse.ui.tests.rcp
+Already tagged R3_3_2 org.eclipse.ui.tests.views.properties.tabbed
+Already tagged R3_3_2 org.eclipse.ui.views
+Already tagged R3_3_2 org.eclipse.ui.views.properties.tabbed
+Already tagged R3_3_2 org.eclipse.ui.win32
+Already tagged R3_3_2 org.eclipse.ui.workbench
+Already tagged R3_3_2 org.eclipse.ui.workbench.compatibility
+Already tagged R3_3_2 org.eclipse.ui.browser
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.examples.job
+Already tagged R3_3_2 org.eclipse.ui.forms
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.tests.browser
+Module org.eclipse.ui.tests.forms empty or not tagged, skipping
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_3_1 R3_3_2 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub34_fix1.sh b/eclipse.platform.ui/pass2/sub34_fix1.sh
new file mode 100644
index 0000000..316de7f
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub34_fix1.sh
@@ -0,0 +1,15 @@
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.core.databinding.observable
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.core.databinding.property
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.jface.snippets
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.cocoa
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.examples.navigator
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.examples.rcp.browser
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.examples.job
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.tests.browser
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub34_fix2.sh b/eclipse.platform.ui/pass2/sub34_fix2.sh
new file mode 100644
index 0000000..593c9a2
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub34_fix2.sh
@@ -0,0 +1,15 @@
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.core.databinding.observable
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.core.databinding.property
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.jface.snippets
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.cocoa
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.examples.navigator
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.examples.rcp.browser
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.examples.job
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.tests.browser
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub34_pass1.sh b/eclipse.platform.ui/pass2/sub34_pass1.sh
new file mode 100644
index 0000000..d4b2643
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub34_pass1.sh
@@ -0,0 +1,51 @@
+Already tagged R3_4_1 org.eclipse.core.commands
+Already tagged R3_4_1 org.eclipse.core.databinding
+Already tagged R3_4_1 org.eclipse.core.databinding.beans
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.core.databinding.observable
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.core.databinding.property
+Already tagged R3_4_1 org.eclipse.jface
+Already tagged R3_4_1 org.eclipse.jface.databinding
+Already tagged R3_4_1 org.eclipse.jface.examples.databinding
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.jface.snippets
+Already tagged R3_4_1 org.eclipse.jface.tests.databinding
+Already tagged R3_4_1 org.eclipse.jface.tests.databinding.conformance
+Already tagged R3_4_1 org.eclipse.ui
+Already tagged R3_4_1 org.eclipse.ui.carbon
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.cocoa
+Already tagged R3_4_1 org.eclipse.ui.examples.contributions
+Already tagged R3_4_1 org.eclipse.ui.examples.fieldassist
+Already tagged R3_4_1 org.eclipse.ui.examples.multipageeditor
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.examples.navigator
+Already tagged R3_4_1 org.eclipse.ui.examples.propertysheet
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.examples.rcp.browser
+Already tagged R3_4_1 org.eclipse.ui.examples.readmetool
+Already tagged R3_4_1 org.eclipse.ui.examples.undo
+Already tagged R3_4_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Already tagged R3_4_1 org.eclipse.ui.ide
+Already tagged R3_4_1 org.eclipse.ui.ide.application
+Already tagged R3_4_1 org.eclipse.ui.navigator
+Already tagged R3_4_1 org.eclipse.ui.navigator.resources
+Already tagged R3_4_1 org.eclipse.ui.presentations.r21
+Already tagged R3_4_1 org.eclipse.ui.tests
+Already tagged R3_4_1 org.eclipse.ui.tests.harness
+Already tagged R3_4_1 org.eclipse.ui.tests.navigator
+Already tagged R3_4_1 org.eclipse.ui.tests.performance
+Already tagged R3_4_1 org.eclipse.ui.tests.rcp
+Already tagged R3_4_1 org.eclipse.ui.tests.views.properties.tabbed
+Already tagged R3_4_1 org.eclipse.ui.views
+Already tagged R3_4_1 org.eclipse.ui.views.properties.tabbed
+Already tagged R3_4_1 org.eclipse.ui.win32
+Already tagged R3_4_1 org.eclipse.ui.workbench
+Already tagged R3_4_1 org.eclipse.ui.workbench.compatibility
+Already tagged R3_4_1 org.eclipse.ui.browser
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.examples.job
+Already tagged R3_4_1 org.eclipse.ui.forms
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.tests.browser
+Already tagged R3_4_1 org.eclipse.ui.tests.forms
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_4 R3_4_1 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub34_pass2.sh b/eclipse.platform.ui/pass2/sub34_pass2.sh
new file mode 100644
index 0000000..5605a7d
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub34_pass2.sh
@@ -0,0 +1,51 @@
+Already tagged R3_4_2 org.eclipse.core.commands
+Already tagged R3_4_2 org.eclipse.core.databinding
+Already tagged R3_4_2 org.eclipse.core.databinding.beans
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.core.databinding.observable
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.core.databinding.property
+Already tagged R3_4_2 org.eclipse.jface
+Already tagged R3_4_2 org.eclipse.jface.databinding
+Already tagged R3_4_2 org.eclipse.jface.examples.databinding
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.jface.snippets
+Already tagged R3_4_2 org.eclipse.jface.tests.databinding
+Already tagged R3_4_2 org.eclipse.jface.tests.databinding.conformance
+Already tagged R3_4_2 org.eclipse.ui
+Already tagged R3_4_2 org.eclipse.ui.carbon
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.cocoa
+Already tagged R3_4_2 org.eclipse.ui.examples.contributions
+Already tagged R3_4_2 org.eclipse.ui.examples.fieldassist
+Already tagged R3_4_2 org.eclipse.ui.examples.multipageeditor
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.examples.navigator
+Already tagged R3_4_2 org.eclipse.ui.examples.propertysheet
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.examples.rcp.browser
+Already tagged R3_4_2 org.eclipse.ui.examples.readmetool
+Already tagged R3_4_2 org.eclipse.ui.examples.undo
+Already tagged R3_4_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Already tagged R3_4_2 org.eclipse.ui.ide
+Already tagged R3_4_2 org.eclipse.ui.ide.application
+Already tagged R3_4_2 org.eclipse.ui.navigator
+Already tagged R3_4_2 org.eclipse.ui.navigator.resources
+Already tagged R3_4_2 org.eclipse.ui.presentations.r21
+Already tagged R3_4_2 org.eclipse.ui.tests
+Already tagged R3_4_2 org.eclipse.ui.tests.harness
+Already tagged R3_4_2 org.eclipse.ui.tests.navigator
+Already tagged R3_4_2 org.eclipse.ui.tests.performance
+Already tagged R3_4_2 org.eclipse.ui.tests.rcp
+Already tagged R3_4_2 org.eclipse.ui.tests.views.properties.tabbed
+Already tagged R3_4_2 org.eclipse.ui.views
+Already tagged R3_4_2 org.eclipse.ui.views.properties.tabbed
+Already tagged R3_4_2 org.eclipse.ui.win32
+Already tagged R3_4_2 org.eclipse.ui.workbench
+Already tagged R3_4_2 org.eclipse.ui.workbench.compatibility
+Already tagged R3_4_2 org.eclipse.ui.browser
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.examples.job
+Already tagged R3_4_2 org.eclipse.ui.forms
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.tests.browser
+Already tagged R3_4_2 org.eclipse.ui.tests.forms
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_4_1 R3_4_2 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub35_fix1.sh b/eclipse.platform.ui/pass2/sub35_fix1.sh
new file mode 100644
index 0000000..5c7f0a8
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub35_fix1.sh
@@ -0,0 +1,12 @@
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.jface.snippets
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.examples.navigator
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.examples.rcp.browser
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.examples.job
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.tests.browser
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub35_fix2.sh b/eclipse.platform.ui/pass2/sub35_fix2.sh
new file mode 100644
index 0000000..0cf643e
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub35_fix2.sh
@@ -0,0 +1,12 @@
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.jface.snippets
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.examples.navigator
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.examples.rcp.browser
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.examples.job
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.tests.browser
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub35_pass1.sh b/eclipse.platform.ui/pass2/sub35_pass1.sh
new file mode 100644
index 0000000..30f8fcc
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub35_pass1.sh
@@ -0,0 +1,51 @@
+Already tagged R3_5_1 org.eclipse.core.commands
+Already tagged R3_5_1 org.eclipse.core.databinding
+Already tagged R3_5_1 org.eclipse.core.databinding.beans
+Already tagged R3_5_1 org.eclipse.core.databinding.observable
+Already tagged R3_5_1 org.eclipse.core.databinding.property
+Already tagged R3_5_1 org.eclipse.jface
+Already tagged R3_5_1 org.eclipse.jface.databinding
+Already tagged R3_5_1 org.eclipse.jface.examples.databinding
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.jface.snippets
+Already tagged R3_5_1 org.eclipse.jface.tests.databinding
+Already tagged R3_5_1 org.eclipse.jface.tests.databinding.conformance
+Already tagged R3_5_1 org.eclipse.ui
+Already tagged R3_5_1 org.eclipse.ui.carbon
+Already tagged R3_5_1 org.eclipse.ui.cocoa
+Already tagged R3_5_1 org.eclipse.ui.examples.contributions
+Already tagged R3_5_1 org.eclipse.ui.examples.fieldassist
+Already tagged R3_5_1 org.eclipse.ui.examples.multipageeditor
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.examples.navigator
+Already tagged R3_5_1 org.eclipse.ui.examples.propertysheet
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.examples.rcp.browser
+Already tagged R3_5_1 org.eclipse.ui.examples.readmetool
+Already tagged R3_5_1 org.eclipse.ui.examples.undo
+Already tagged R3_5_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Already tagged R3_5_1 org.eclipse.ui.ide
+Already tagged R3_5_1 org.eclipse.ui.ide.application
+Already tagged R3_5_1 org.eclipse.ui.navigator
+Already tagged R3_5_1 org.eclipse.ui.navigator.resources
+Already tagged R3_5_1 org.eclipse.ui.presentations.r21
+Already tagged R3_5_1 org.eclipse.ui.tests
+Already tagged R3_5_1 org.eclipse.ui.tests.harness
+Already tagged R3_5_1 org.eclipse.ui.tests.navigator
+Already tagged R3_5_1 org.eclipse.ui.tests.performance
+Already tagged R3_5_1 org.eclipse.ui.tests.rcp
+Already tagged R3_5_1 org.eclipse.ui.tests.views.properties.tabbed
+Already tagged R3_5_1 org.eclipse.ui.views
+Already tagged R3_5_1 org.eclipse.ui.views.properties.tabbed
+Already tagged R3_5_1 org.eclipse.ui.win32
+Already tagged R3_5_1 org.eclipse.ui.workbench
+Already tagged R3_5_1 org.eclipse.ui.workbench.compatibility
+Already tagged R3_5_1 org.eclipse.ui.browser
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.examples.job
+Already tagged R3_5_1 org.eclipse.ui.forms
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.tests.browser
+Already tagged R3_5_1 org.eclipse.ui.tests.forms
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_5 R3_5_1 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/sub35_pass2.sh b/eclipse.platform.ui/pass2/sub35_pass2.sh
new file mode 100644
index 0000000..2816556
--- /dev/null
+++ b/eclipse.platform.ui/pass2/sub35_pass2.sh
@@ -0,0 +1,51 @@
+Already tagged R3_5_2 org.eclipse.core.commands
+Already tagged R3_5_2 org.eclipse.core.databinding
+Already tagged R3_5_2 org.eclipse.core.databinding.beans
+Already tagged R3_5_2 org.eclipse.core.databinding.observable
+Already tagged R3_5_2 org.eclipse.core.databinding.property
+Already tagged R3_5_2 org.eclipse.jface
+Already tagged R3_5_2 org.eclipse.jface.databinding
+Already tagged R3_5_2 org.eclipse.jface.examples.databinding
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.jface.snippets
+Already tagged R3_5_2 org.eclipse.jface.tests.databinding
+Already tagged R3_5_2 org.eclipse.jface.tests.databinding.conformance
+Already tagged R3_5_2 org.eclipse.ui
+Already tagged R3_5_2 org.eclipse.ui.carbon
+Already tagged R3_5_2 org.eclipse.ui.cocoa
+Already tagged R3_5_2 org.eclipse.ui.examples.contributions
+Already tagged R3_5_2 org.eclipse.ui.examples.fieldassist
+Already tagged R3_5_2 org.eclipse.ui.examples.multipageeditor
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.examples.navigator
+Already tagged R3_5_2 org.eclipse.ui.examples.propertysheet
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.examples.presentation
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.examples.rcp.browser
+Already tagged R3_5_2 org.eclipse.ui.examples.readmetool
+Already tagged R3_5_2 org.eclipse.ui.examples.undo
+Already tagged R3_5_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Already tagged R3_5_2 org.eclipse.ui.ide
+Already tagged R3_5_2 org.eclipse.ui.ide.application
+Already tagged R3_5_2 org.eclipse.ui.navigator
+Already tagged R3_5_2 org.eclipse.ui.navigator.resources
+Already tagged R3_5_2 org.eclipse.ui.presentations.r21
+Already tagged R3_5_2 org.eclipse.ui.tests
+Already tagged R3_5_2 org.eclipse.ui.tests.harness
+Already tagged R3_5_2 org.eclipse.ui.tests.navigator
+Already tagged R3_5_2 org.eclipse.ui.tests.performance
+Already tagged R3_5_2 org.eclipse.ui.tests.rcp
+Already tagged R3_5_2 org.eclipse.ui.tests.views.properties.tabbed
+Already tagged R3_5_2 org.eclipse.ui.views
+Already tagged R3_5_2 org.eclipse.ui.views.properties.tabbed
+Already tagged R3_5_2 org.eclipse.ui.win32
+Already tagged R3_5_2 org.eclipse.ui.workbench
+Already tagged R3_5_2 org.eclipse.ui.workbench.compatibility
+Already tagged R3_5_2 org.eclipse.ui.browser
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.examples.job
+Already tagged R3_5_2 org.eclipse.ui.forms
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.tests.browser
+Already tagged R3_5_2 org.eclipse.ui.tests.forms
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_5_1 R3_5_2 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/subtag_fix1.sh b/eclipse.platform.ui/pass2/subtag_fix1.sh
new file mode 100644
index 0000000..e2684b8
--- /dev/null
+++ b/eclipse.platform.ui/pass2/subtag_fix1.sh
@@ -0,0 +1,6 @@
+cvs rtag -R -rR3_6 R3_6_1 org.eclipse.ui.examples.job
+cvs rtag -R -rR3_6 R3_6_1 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_6 R3_6_1 org.eclipse.ui.tests.browser
+cvs rtag -R -rR3_6 R3_6_1 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_6 R3_6_1 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_6 R3_6_1 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/subtag_fix3.sh b/eclipse.platform.ui/pass2/subtag_fix3.sh
new file mode 100644
index 0000000..6435a41
--- /dev/null
+++ b/eclipse.platform.ui/pass2/subtag_fix3.sh
@@ -0,0 +1,6 @@
+cvs rtag -R -rR3_6_1 R3_6_2 org.eclipse.ui.examples.job
+cvs rtag -R -rR3_6_1 R3_6_2 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_6_1 R3_6_2 org.eclipse.ui.tests.browser
+cvs rtag -R -rR3_6_1 R3_6_2 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_6_1 R3_6_2 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_6_1 R3_6_2 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/subtag_pass1.sh b/eclipse.platform.ui/pass2/subtag_pass1.sh
new file mode 100644
index 0000000..5613298
--- /dev/null
+++ b/eclipse.platform.ui/pass2/subtag_pass1.sh
@@ -0,0 +1,51 @@
+Already tagged R3_6_1 org.eclipse.core.commands
+Already tagged R3_6_1 org.eclipse.core.databinding
+Already tagged R3_6_1 org.eclipse.core.databinding.beans
+Already tagged R3_6_1 org.eclipse.core.databinding.observable
+Already tagged R3_6_1 org.eclipse.core.databinding.property
+Already tagged R3_6_1 org.eclipse.jface
+Already tagged R3_6_1 org.eclipse.jface.databinding
+Already tagged R3_6_1 org.eclipse.jface.examples.databinding
+Already tagged R3_6_1 org.eclipse.jface.snippets
+Already tagged R3_6_1 org.eclipse.jface.tests.databinding
+Already tagged R3_6_1 org.eclipse.jface.tests.databinding.conformance
+Already tagged R3_6_1 org.eclipse.ui
+Already tagged R3_6_1 org.eclipse.ui.carbon
+Already tagged R3_6_1 org.eclipse.ui.cocoa
+Already tagged R3_6_1 org.eclipse.ui.examples.contributions
+Already tagged R3_6_1 org.eclipse.ui.examples.fieldassist
+Already tagged R3_6_1 org.eclipse.ui.examples.multipageeditor
+Already tagged R3_6_1 org.eclipse.ui.examples.navigator
+Already tagged R3_6_1 org.eclipse.ui.examples.propertysheet
+Already tagged R3_6_1 org.eclipse.ui.examples.presentation
+Already tagged R3_6_1 org.eclipse.ui.examples.rcp.browser
+Already tagged R3_6_1 org.eclipse.ui.examples.readmetool
+Already tagged R3_6_1 org.eclipse.ui.examples.undo
+Already tagged R3_6_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+Already tagged R3_6_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+Already tagged R3_6_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Already tagged R3_6_1 org.eclipse.ui.ide
+Already tagged R3_6_1 org.eclipse.ui.ide.application
+Already tagged R3_6_1 org.eclipse.ui.navigator
+Already tagged R3_6_1 org.eclipse.ui.navigator.resources
+Already tagged R3_6_1 org.eclipse.ui.presentations.r21
+Already tagged R3_6_1 org.eclipse.ui.tests
+Already tagged R3_6_1 org.eclipse.ui.tests.harness
+Already tagged R3_6_1 org.eclipse.ui.tests.navigator
+Already tagged R3_6_1 org.eclipse.ui.tests.performance
+Already tagged R3_6_1 org.eclipse.ui.tests.rcp
+Already tagged R3_6_1 org.eclipse.ui.tests.views.properties.tabbed
+Already tagged R3_6_1 org.eclipse.ui.views
+Already tagged R3_6_1 org.eclipse.ui.views.properties.tabbed
+Already tagged R3_6_1 org.eclipse.ui.win32
+Already tagged R3_6_1 org.eclipse.ui.workbench
+Already tagged R3_6_1 org.eclipse.ui.workbench.compatibility
+Already tagged R3_6_1 org.eclipse.ui.browser
+cvs rtag -R -rR3_6 R3_6_1 org.eclipse.ui.examples.job
+Already tagged R3_6_1 org.eclipse.ui.forms
+cvs rtag -R -rR3_6 R3_6_1 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_6 R3_6_1 org.eclipse.ui.tests.browser
+Already tagged R3_6_1 org.eclipse.ui.tests.forms
+cvs rtag -R -rR3_6 R3_6_1 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_6 R3_6_1 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_6 R3_6_1 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/subtag_pass2.sh b/eclipse.platform.ui/pass2/subtag_pass2.sh
new file mode 100644
index 0000000..1f6f10e
--- /dev/null
+++ b/eclipse.platform.ui/pass2/subtag_pass2.sh
@@ -0,0 +1,51 @@
+Already tagged R3_6_1 org.eclipse.core.commands
+Already tagged R3_6_1 org.eclipse.core.databinding
+Already tagged R3_6_1 org.eclipse.core.databinding.beans
+Already tagged R3_6_1 org.eclipse.core.databinding.observable
+Already tagged R3_6_1 org.eclipse.core.databinding.property
+Already tagged R3_6_1 org.eclipse.jface
+Already tagged R3_6_1 org.eclipse.jface.databinding
+Already tagged R3_6_1 org.eclipse.jface.examples.databinding
+Already tagged R3_6_1 org.eclipse.jface.snippets
+Already tagged R3_6_1 org.eclipse.jface.tests.databinding
+Already tagged R3_6_1 org.eclipse.jface.tests.databinding.conformance
+Already tagged R3_6_1 org.eclipse.ui
+Already tagged R3_6_1 org.eclipse.ui.carbon
+Already tagged R3_6_1 org.eclipse.ui.cocoa
+Already tagged R3_6_1 org.eclipse.ui.examples.contributions
+Already tagged R3_6_1 org.eclipse.ui.examples.fieldassist
+Already tagged R3_6_1 org.eclipse.ui.examples.multipageeditor
+Already tagged R3_6_1 org.eclipse.ui.examples.navigator
+Already tagged R3_6_1 org.eclipse.ui.examples.propertysheet
+Already tagged R3_6_1 org.eclipse.ui.examples.presentation
+Already tagged R3_6_1 org.eclipse.ui.examples.rcp.browser
+Already tagged R3_6_1 org.eclipse.ui.examples.readmetool
+Already tagged R3_6_1 org.eclipse.ui.examples.undo
+Already tagged R3_6_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+Already tagged R3_6_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+Already tagged R3_6_1 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Already tagged R3_6_1 org.eclipse.ui.ide
+Already tagged R3_6_1 org.eclipse.ui.ide.application
+Already tagged R3_6_1 org.eclipse.ui.navigator
+Already tagged R3_6_1 org.eclipse.ui.navigator.resources
+Already tagged R3_6_1 org.eclipse.ui.presentations.r21
+Already tagged R3_6_1 org.eclipse.ui.tests
+Already tagged R3_6_1 org.eclipse.ui.tests.harness
+Already tagged R3_6_1 org.eclipse.ui.tests.navigator
+Already tagged R3_6_1 org.eclipse.ui.tests.performance
+Already tagged R3_6_1 org.eclipse.ui.tests.rcp
+Already tagged R3_6_1 org.eclipse.ui.tests.views.properties.tabbed
+Already tagged R3_6_1 org.eclipse.ui.views
+Already tagged R3_6_1 org.eclipse.ui.views.properties.tabbed
+Already tagged R3_6_1 org.eclipse.ui.win32
+Already tagged R3_6_1 org.eclipse.ui.workbench
+Already tagged R3_6_1 org.eclipse.ui.workbench.compatibility
+Already tagged R3_6_1 org.eclipse.ui.browser
+Already tagged R3_6_1 org.eclipse.ui.examples.job
+Already tagged R3_6_1 org.eclipse.ui.forms
+Already tagged R3_6_1 org.eclipse.ui.forms.examples
+Already tagged R3_6_1 org.eclipse.ui.tests.browser
+Already tagged R3_6_1 org.eclipse.ui.tests.forms
+Already tagged R3_6_1 org.eclipse.ui.tutorials.rcp.part1
+Already tagged R3_6_1 org.eclipse.ui.tutorials.rcp.part2
+Already tagged R3_6_1 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/subtag_pass3.sh b/eclipse.platform.ui/pass2/subtag_pass3.sh
new file mode 100644
index 0000000..a7fc64b
--- /dev/null
+++ b/eclipse.platform.ui/pass2/subtag_pass3.sh
@@ -0,0 +1,51 @@
+Already tagged R3_6_2 org.eclipse.core.commands
+Already tagged R3_6_2 org.eclipse.core.databinding
+Already tagged R3_6_2 org.eclipse.core.databinding.beans
+Already tagged R3_6_2 org.eclipse.core.databinding.observable
+Already tagged R3_6_2 org.eclipse.core.databinding.property
+Already tagged R3_6_2 org.eclipse.jface
+Already tagged R3_6_2 org.eclipse.jface.databinding
+Already tagged R3_6_2 org.eclipse.jface.examples.databinding
+Already tagged R3_6_2 org.eclipse.jface.snippets
+Already tagged R3_6_2 org.eclipse.jface.tests.databinding
+Already tagged R3_6_2 org.eclipse.jface.tests.databinding.conformance
+Already tagged R3_6_2 org.eclipse.ui
+Already tagged R3_6_2 org.eclipse.ui.carbon
+Already tagged R3_6_2 org.eclipse.ui.cocoa
+Already tagged R3_6_2 org.eclipse.ui.examples.contributions
+Already tagged R3_6_2 org.eclipse.ui.examples.fieldassist
+Already tagged R3_6_2 org.eclipse.ui.examples.multipageeditor
+Already tagged R3_6_2 org.eclipse.ui.examples.navigator
+Already tagged R3_6_2 org.eclipse.ui.examples.propertysheet
+Already tagged R3_6_2 org.eclipse.ui.examples.presentation
+Already tagged R3_6_2 org.eclipse.ui.examples.rcp.browser
+Already tagged R3_6_2 org.eclipse.ui.examples.readmetool
+Already tagged R3_6_2 org.eclipse.ui.examples.undo
+Already tagged R3_6_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+Already tagged R3_6_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+Already tagged R3_6_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Already tagged R3_6_2 org.eclipse.ui.ide
+Already tagged R3_6_2 org.eclipse.ui.ide.application
+Already tagged R3_6_2 org.eclipse.ui.navigator
+Already tagged R3_6_2 org.eclipse.ui.navigator.resources
+Already tagged R3_6_2 org.eclipse.ui.presentations.r21
+Already tagged R3_6_2 org.eclipse.ui.tests
+Already tagged R3_6_2 org.eclipse.ui.tests.harness
+Already tagged R3_6_2 org.eclipse.ui.tests.navigator
+Already tagged R3_6_2 org.eclipse.ui.tests.performance
+Already tagged R3_6_2 org.eclipse.ui.tests.rcp
+Already tagged R3_6_2 org.eclipse.ui.tests.views.properties.tabbed
+Already tagged R3_6_2 org.eclipse.ui.views
+Already tagged R3_6_2 org.eclipse.ui.views.properties.tabbed
+Already tagged R3_6_2 org.eclipse.ui.win32
+Already tagged R3_6_2 org.eclipse.ui.workbench
+Already tagged R3_6_2 org.eclipse.ui.workbench.compatibility
+Already tagged R3_6_2 org.eclipse.ui.browser
+cvs rtag -R -rR3_6_1 R3_6_2 org.eclipse.ui.examples.job
+Already tagged R3_6_2 org.eclipse.ui.forms
+cvs rtag -R -rR3_6_1 R3_6_2 org.eclipse.ui.forms.examples
+cvs rtag -R -rR3_6_1 R3_6_2 org.eclipse.ui.tests.browser
+Already tagged R3_6_2 org.eclipse.ui.tests.forms
+cvs rtag -R -rR3_6_1 R3_6_2 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -R -rR3_6_1 R3_6_2 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -R -rR3_6_1 R3_6_2 org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/tag30_fix1.sh b/eclipse.platform.ui/pass2/tag30_fix1.sh
new file mode 100644
index 0000000..402ea16
--- /dev/null
+++ b/eclipse.platform.ui/pass2/tag30_fix1.sh
@@ -0,0 +1,17 @@
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.carbon
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.examples.multipageeditor
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.examples.propertysheet
+cvs rtag -D"06/25/2004 00:00" R3_0 org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.examples.readmetool
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.workbench.compatibility
+cvs rtag -D"06/25/2004 00:00" R3_0 org.eclipse.ui.examples.job
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.examples.job
+cvs rtag -D"06/25/2004 00:00" R3_0 org.eclipse.ui.forms.examples
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.forms.examples
+cvs rtag -D"06/25/2004 00:00" R3_0 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -D"06/25/2004 00:00" R3_0 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -D"06/25/2004 00:00" R3_0 org.eclipse.ui.tutorials.rcp.part3
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/tag30_pass1.sh b/eclipse.platform.ui/pass2/tag30_pass1.sh
new file mode 100644
index 0000000..25572ba
--- /dev/null
+++ b/eclipse.platform.ui/pass2/tag30_pass1.sh
@@ -0,0 +1,57 @@
+Module org.eclipse.core.commands empty on 06/25/2004 00:00
+Module org.eclipse.core.databinding empty on 06/25/2004 00:00
+Module org.eclipse.core.databinding.beans empty on 06/25/2004 00:00
+Module org.eclipse.core.databinding.observable empty on 06/25/2004 00:00
+Module org.eclipse.core.databinding.property empty on 06/25/2004 00:00
+Correct R3_0_maintenance for org.eclipse.jface
+Module org.eclipse.jface.databinding empty on 06/25/2004 00:00
+Module org.eclipse.jface.examples.databinding empty on 06/25/2004 00:00
+Module org.eclipse.jface.snippets empty on 06/25/2004 00:00
+Module org.eclipse.jface.tests.databinding empty on 06/25/2004 00:00
+Module org.eclipse.jface.tests.databinding.conformance empty on 06/25/2004 00:00
+Correct R3_0_maintenance for org.eclipse.ui
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.carbon
+Module org.eclipse.ui.cocoa empty on 06/25/2004 00:00
+Module org.eclipse.ui.examples.contributions empty on 06/25/2004 00:00
+Module org.eclipse.ui.examples.fieldassist empty on 06/25/2004 00:00
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.examples.multipageeditor
+Module org.eclipse.ui.examples.navigator empty on 06/25/2004 00:00
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.examples.propertysheet
+Module org.eclipse.ui.examples.presentation empty on 06/25/2004 00:00
+cvs rtag -D"06/25/2004 00:00" R3_0 org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.examples.readmetool
+Module org.eclipse.ui.examples.undo empty on 06/25/2004 00:00
+Module org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article empty on 06/25/2004 00:00
+Module org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague empty on 06/25/2004 00:00
+Module org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic empty on 06/25/2004 00:00
+Correct R3_0_maintenance for org.eclipse.ui.ide
+Module org.eclipse.ui.ide.application empty on 06/25/2004 00:00
+Module org.eclipse.ui.navigator empty on 06/25/2004 00:00
+Module org.eclipse.ui.navigator.resources empty on 06/25/2004 00:00
+Correct R3_0_maintenance for org.eclipse.ui.presentations.r21
+Correct R3_0_maintenance for org.eclipse.ui.tests
+Module org.eclipse.ui.tests.harness empty on 06/25/2004 00:00
+Module org.eclipse.ui.tests.navigator empty on 06/25/2004 00:00
+Module org.eclipse.ui.tests.performance empty on 06/25/2004 00:00
+Module org.eclipse.ui.tests.rcp empty on 06/25/2004 00:00
+Module org.eclipse.ui.tests.views.properties.tabbed empty on 06/25/2004 00:00
+Correct R3_0_maintenance for org.eclipse.ui.views
+Module org.eclipse.ui.views.properties.tabbed empty on 06/25/2004 00:00
+Correct R3_0_maintenance for org.eclipse.ui.win32
+Correct R3_0_maintenance for org.eclipse.ui.workbench
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.workbench.compatibility
+Module org.eclipse.ui.browser empty on 06/25/2004 00:00
+cvs rtag -D"06/25/2004 00:00" R3_0 org.eclipse.ui.examples.job
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.examples.job
+Correct R3_0_maintenance for org.eclipse.ui.forms
+cvs rtag -D"06/25/2004 00:00" R3_0 org.eclipse.ui.forms.examples
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.forms.examples
+Module org.eclipse.ui.tests.browser empty on 06/25/2004 00:00
+Module org.eclipse.ui.tests.forms empty on 06/25/2004 00:00
+cvs rtag -D"06/25/2004 00:00" R3_0 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -D"06/25/2004 00:00" R3_0 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -D"06/25/2004 00:00" R3_0 org.eclipse.ui.tutorials.rcp.part3
+cvs rtag -b -rR3_0 R3_0_maintenance org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/tag31_fix1.sh b/eclipse.platform.ui/pass2/tag31_fix1.sh
new file mode 100644
index 0000000..36effd0
--- /dev/null
+++ b/eclipse.platform.ui/pass2/tag31_fix1.sh
@@ -0,0 +1,32 @@
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.core.commands
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.examples.contributions
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.examples.contributions
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.examples.multipageeditor
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.examples.propertysheet
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.examples.presentation
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.examples.presentation
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.examples.readmetool
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.examples.undo
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.navigator
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.navigator
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.presentations.r21
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.tests.rcp
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.win32
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.workbench.compatibility
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.examples.job
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.examples.job
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.forms
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.forms.examples
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.forms.examples
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.tests.browser
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.tests.browser
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.tutorials.rcp.part3
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/tag31_pass1.sh b/eclipse.platform.ui/pass2/tag31_pass1.sh
new file mode 100644
index 0000000..3c6b034
--- /dev/null
+++ b/eclipse.platform.ui/pass2/tag31_pass1.sh
@@ -0,0 +1,62 @@
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.core.commands
+Module org.eclipse.core.databinding empty on 06/28/2005 00:00
+Module org.eclipse.core.databinding.beans empty on 06/28/2005 00:00
+Module org.eclipse.core.databinding.observable empty on 06/28/2005 00:00
+Module org.eclipse.core.databinding.property empty on 06/28/2005 00:00
+Correct R3_1_maintenance for org.eclipse.jface
+Module org.eclipse.jface.databinding empty on 06/28/2005 00:00
+Module org.eclipse.jface.examples.databinding empty on 06/28/2005 00:00
+Module org.eclipse.jface.snippets empty on 06/28/2005 00:00
+Module org.eclipse.jface.tests.databinding empty on 06/28/2005 00:00
+Module org.eclipse.jface.tests.databinding.conformance empty on 06/28/2005 00:00
+Correct R3_1_maintenance for org.eclipse.ui
+Correct R3_1_maintenance for org.eclipse.ui.carbon
+Module org.eclipse.ui.cocoa empty on 06/28/2005 00:00
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.examples.contributions
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.examples.contributions
+Module org.eclipse.ui.examples.fieldassist empty on 06/28/2005 00:00
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.examples.multipageeditor
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.examples.propertysheet
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.examples.presentation
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.examples.presentation
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.examples.readmetool
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.examples.undo
+Module org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article empty on 06/28/2005 00:00
+Module org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague empty on 06/28/2005 00:00
+Module org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic empty on 06/28/2005 00:00
+Correct R3_1_maintenance for org.eclipse.ui.ide
+Module org.eclipse.ui.ide.application empty on 06/28/2005 00:00
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.navigator
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.navigator
+Module org.eclipse.ui.navigator.resources empty on 06/28/2005 00:00
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.presentations.r21
+Correct R3_1_maintenance for org.eclipse.ui.tests
+Module org.eclipse.ui.tests.harness empty on 06/28/2005 00:00
+Module org.eclipse.ui.tests.navigator empty on 06/28/2005 00:00
+Module org.eclipse.ui.tests.performance empty on 06/28/2005 00:00
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.tests.rcp
+Module org.eclipse.ui.tests.views.properties.tabbed empty on 06/28/2005 00:00
+Correct R3_1_maintenance for org.eclipse.ui.views
+Module org.eclipse.ui.views.properties.tabbed empty on 06/28/2005 00:00
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.win32
+Correct R3_1_maintenance for org.eclipse.ui.workbench
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.workbench.compatibility
+Correct R3_1_maintenance for org.eclipse.ui.browser
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.examples.job
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.examples.job
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.forms
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.forms.examples
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.forms.examples
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.tests.browser
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.tests.browser
+Module org.eclipse.ui.tests.forms empty on 06/28/2005 00:00
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -D"06/28/2005 00:00" R3_1 org.eclipse.ui.tutorials.rcp.part3
+cvs rtag -b -rR3_1 R3_1_maintenance org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/tag32_fix1.sh b/eclipse.platform.ui/pass2/tag32_fix1.sh
new file mode 100644
index 0000000..81206db
--- /dev/null
+++ b/eclipse.platform.ui/pass2/tag32_fix1.sh
@@ -0,0 +1,41 @@
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.core.commands
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.jface.databinding
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.jface.examples.databinding
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.jface.tests.databinding
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.carbon
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.examples.contributions
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.contributions
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.fieldassist
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.multipageeditor
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.propertysheet
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.examples.presentation
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.presentation
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.readmetool
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.undo
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.presentations.r21
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.tests.harness
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.tests.rcp
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.tests.views.properties.tabbed
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.win32
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.workbench.compatibility
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.browser
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.examples.job
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.job
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.forms.examples
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.tests.browser
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.tests.browser
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.tutorials.rcp.part3
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/tag32_pass1.sh b/eclipse.platform.ui/pass2/tag32_pass1.sh
new file mode 100644
index 0000000..9d23af7
--- /dev/null
+++ b/eclipse.platform.ui/pass2/tag32_pass1.sh
@@ -0,0 +1,62 @@
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.core.commands
+Module org.eclipse.core.databinding empty on 06/06/2006 00:00
+Module org.eclipse.core.databinding.beans empty on 06/06/2006 00:00
+Module org.eclipse.core.databinding.observable empty on 06/06/2006 00:00
+Module org.eclipse.core.databinding.property empty on 06/06/2006 00:00
+Correct R3_2_maintenance for org.eclipse.jface
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.jface.databinding
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.jface.examples.databinding
+Module org.eclipse.jface.snippets empty on 06/06/2006 00:00
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.jface.tests.databinding
+Module org.eclipse.jface.tests.databinding.conformance empty on 06/06/2006 00:00
+Correct R3_2_maintenance for org.eclipse.ui
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.carbon
+Module org.eclipse.ui.cocoa empty on 06/06/2006 00:00
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.examples.contributions
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.contributions
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.fieldassist
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.multipageeditor
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.propertysheet
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.examples.presentation
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.presentation
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.readmetool
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.undo
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Correct R3_2_maintenance for org.eclipse.ui.ide
+Module org.eclipse.ui.ide.application empty on 06/06/2006 00:00
+Correct R3_2_maintenance for org.eclipse.ui.navigator
+Correct R3_2_maintenance for org.eclipse.ui.navigator.resources
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.presentations.r21
+Correct R3_2_maintenance for org.eclipse.ui.tests
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.tests.harness
+Correct R3_2_maintenance for org.eclipse.ui.tests.navigator
+Correct R3_2_maintenance for org.eclipse.ui.tests.performance
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.tests.rcp
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.tests.views.properties.tabbed
+Correct R3_2_maintenance for org.eclipse.ui.views
+Correct R3_2_maintenance for org.eclipse.ui.views.properties.tabbed
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.win32
+Correct R3_2_maintenance for org.eclipse.ui.workbench
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.workbench.compatibility
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.browser
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.examples.job
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.examples.job
+Correct R3_2_maintenance for org.eclipse.ui.forms
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.forms.examples
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.tests.browser
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.tests.browser
+Module org.eclipse.ui.tests.forms empty on 06/06/2006 00:00
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -D"06/06/2006 00:00" R3_2 org.eclipse.ui.tutorials.rcp.part3
+cvs rtag -b -rR3_2 R3_2_maintenance org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/tag33_fix1.sh b/eclipse.platform.ui/pass2/tag33_fix1.sh
new file mode 100644
index 0000000..82b0c1b
--- /dev/null
+++ b/eclipse.platform.ui/pass2/tag33_fix1.sh
@@ -0,0 +1,43 @@
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.core.commands
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.jface.examples.databinding
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.jface.snippets
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.jface.snippets
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.carbon
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.contributions
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.fieldassist
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.multipageeditor
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.propertysheet
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.examples.presentation
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.presentation
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.readmetool
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.undo
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.ide.application
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.presentations.r21
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.tests.harness
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.tests.rcp
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.tests.views.properties.tabbed
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.win32
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.workbench.compatibility
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.browser
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.examples.job
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.job
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.forms
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.forms.examples
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.forms.examples
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.tests.browser
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.tests.browser
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.tutorials.rcp.part3
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/tag33_pass1.sh b/eclipse.platform.ui/pass2/tag33_pass1.sh
new file mode 100644
index 0000000..687e627
--- /dev/null
+++ b/eclipse.platform.ui/pass2/tag33_pass1.sh
@@ -0,0 +1,63 @@
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.core.commands
+Correct R3_3_maintenance for org.eclipse.core.databinding
+Correct R3_3_maintenance for org.eclipse.core.databinding.beans
+Module empty on 06/14/2007 00:00
+Module empty on 06/14/2007 00:00
+Correct R3_3_maintenance for org.eclipse.jface
+Correct R3_3_maintenance for org.eclipse.jface.databinding
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.jface.examples.databinding
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.jface.snippets
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.jface.snippets
+Correct R3_3_maintenance for org.eclipse.jface.tests.databinding
+Module empty on 06/14/2007 00:00
+Correct R3_3_maintenance for org.eclipse.ui
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.carbon
+Module empty on 06/14/2007 00:00
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.contributions
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.fieldassist
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.multipageeditor
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.propertysheet
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.examples.presentation
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.presentation
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.readmetool
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.undo
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Correct R3_3_maintenance for org.eclipse.ui.ide
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.ide.application
+Correct R3_3_maintenance for org.eclipse.ui.navigator
+Correct R3_3_maintenance for org.eclipse.ui.navigator.resources
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.presentations.r21
+Correct R3_3_maintenance for org.eclipse.ui.tests
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.tests.harness
+Correct R3_3_maintenance for org.eclipse.ui.tests.navigator
+Correct R3_3_maintenance for org.eclipse.ui.tests.performance
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.tests.rcp
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.tests.views.properties.tabbed
+Correct R3_3_maintenance for org.eclipse.ui.views
+Correct R3_3_maintenance for org.eclipse.ui.views.properties.tabbed
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.win32
+Correct R3_3_maintenance for org.eclipse.ui.workbench
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.workbench.compatibility
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.browser
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.examples.job
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.examples.job
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.forms
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.forms.examples
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.forms.examples
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.tests.browser
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.tests.browser
+Module empty on 06/14/2007 00:00
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -D"06/14/2007 00:00" R3_3 org.eclipse.ui.tutorials.rcp.part3
+cvs rtag -b -rR3_3 R3_3_maintenance org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/tag34_fix1.sh b/eclipse.platform.ui/pass2/tag34_fix1.sh
new file mode 100644
index 0000000..a271309
--- /dev/null
+++ b/eclipse.platform.ui/pass2/tag34_fix1.sh
@@ -0,0 +1,40 @@
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.jface.examples.databinding
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.jface.snippets
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.jface.snippets
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.carbon
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.contributions
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.fieldassist
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.multipageeditor
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.propertysheet
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.examples.presentation
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.presentation
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.readmetool
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.undo
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.presentations.r21
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.tests.harness
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.tests.performance
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.tests.rcp
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.tests.views.properties.tabbed
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.win32
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.workbench.compatibility
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.examples.job
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.job
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.forms.examples
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.tests.browser
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.tests.browser
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.tests.forms
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.tutorials.rcp.part3
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/tag34_pass1.sh b/eclipse.platform.ui/pass2/tag34_pass1.sh
new file mode 100644
index 0000000..44d6a3d
--- /dev/null
+++ b/eclipse.platform.ui/pass2/tag34_pass1.sh
@@ -0,0 +1,62 @@
+Correct R3_4_maintenance for org.eclipse.core.commands
+Correct R3_4_maintenance for org.eclipse.core.databinding
+Correct R3_4_maintenance for org.eclipse.core.databinding.beans
+Module empty on 06/11/2008 00:00
+Module empty on 06/11/2008 00:00
+Correct R3_4_maintenance for org.eclipse.jface
+Correct R3_4_maintenance for org.eclipse.jface.databinding
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.jface.examples.databinding
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.jface.snippets
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.jface.snippets
+Correct R3_4_maintenance for org.eclipse.jface.tests.databinding
+Correct R3_4_maintenance for org.eclipse.jface.tests.databinding.conformance
+Correct R3_4_maintenance for org.eclipse.ui
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.carbon
+Module empty on 06/11/2008 00:00
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.contributions
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.fieldassist
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.multipageeditor
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.propertysheet
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.examples.presentation
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.presentation
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.readmetool
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.undo
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Correct R3_4_maintenance for org.eclipse.ui.ide
+Correct R3_4_maintenance for org.eclipse.ui.ide.application
+Correct R3_4_maintenance for org.eclipse.ui.navigator
+Correct R3_4_maintenance for org.eclipse.ui.navigator.resources
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.presentations.r21
+Correct R3_4_maintenance for org.eclipse.ui.tests
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.tests.harness
+Correct R3_4_maintenance for org.eclipse.ui.tests.navigator
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.tests.performance
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.tests.rcp
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.tests.views.properties.tabbed
+Correct R3_4_maintenance for org.eclipse.ui.views
+Correct R3_4_maintenance for org.eclipse.ui.views.properties.tabbed
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.win32
+Correct R3_4_maintenance for org.eclipse.ui.workbench
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.workbench.compatibility
+Correct R3_4_maintenance for org.eclipse.ui.browser
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.examples.job
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.examples.job
+Correct R3_4_maintenance for org.eclipse.ui.forms
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.forms.examples
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.tests.browser
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.tests.browser
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.tests.forms
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -D"06/11/2008 00:00" R3_4 org.eclipse.ui.tutorials.rcp.part3
+cvs rtag -b -rR3_4 R3_4_maintenance org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/tag34_pass2.sh b/eclipse.platform.ui/pass2/tag34_pass2.sh
new file mode 100644
index 0000000..82fe3de
--- /dev/null
+++ b/eclipse.platform.ui/pass2/tag34_pass2.sh
@@ -0,0 +1,51 @@
+Correct R3_4_maintenance for org.eclipse.core.commands
+Correct R3_4_maintenance for org.eclipse.core.databinding
+Correct R3_4_maintenance for org.eclipse.core.databinding.beans
+Module empty on 06/11/2008 00:00
+Module empty on 06/11/2008 00:00
+Correct R3_4_maintenance for org.eclipse.jface
+Correct R3_4_maintenance for org.eclipse.jface.databinding
+Correct R3_4_maintenance for org.eclipse.jface.examples.databinding
+Correct R3_4_maintenance for org.eclipse.jface.snippets
+Correct R3_4_maintenance for org.eclipse.jface.tests.databinding
+Correct R3_4_maintenance for org.eclipse.jface.tests.databinding.conformance
+Correct R3_4_maintenance for org.eclipse.ui
+Correct R3_4_maintenance for org.eclipse.ui.carbon
+Module empty on 06/11/2008 00:00
+Correct R3_4_maintenance for org.eclipse.ui.examples.contributions
+Correct R3_4_maintenance for org.eclipse.ui.examples.fieldassist
+Correct R3_4_maintenance for org.eclipse.ui.examples.multipageeditor
+Correct R3_4_maintenance for org.eclipse.ui.examples.navigator
+Correct R3_4_maintenance for org.eclipse.ui.examples.propertysheet
+Correct R3_4_maintenance for org.eclipse.ui.examples.presentation
+Correct R3_4_maintenance for org.eclipse.ui.examples.rcp.browser
+Correct R3_4_maintenance for org.eclipse.ui.examples.readmetool
+Correct R3_4_maintenance for org.eclipse.ui.examples.undo
+Correct R3_4_maintenance for org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+Correct R3_4_maintenance for org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+Correct R3_4_maintenance for org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Correct R3_4_maintenance for org.eclipse.ui.ide
+Correct R3_4_maintenance for org.eclipse.ui.ide.application
+Correct R3_4_maintenance for org.eclipse.ui.navigator
+Correct R3_4_maintenance for org.eclipse.ui.navigator.resources
+Correct R3_4_maintenance for org.eclipse.ui.presentations.r21
+Correct R3_4_maintenance for org.eclipse.ui.tests
+Correct R3_4_maintenance for org.eclipse.ui.tests.harness
+Correct R3_4_maintenance for org.eclipse.ui.tests.navigator
+Correct R3_4_maintenance for org.eclipse.ui.tests.performance
+Correct R3_4_maintenance for org.eclipse.ui.tests.rcp
+Correct R3_4_maintenance for org.eclipse.ui.tests.views.properties.tabbed
+Correct R3_4_maintenance for org.eclipse.ui.views
+Correct R3_4_maintenance for org.eclipse.ui.views.properties.tabbed
+Correct R3_4_maintenance for org.eclipse.ui.win32
+Correct R3_4_maintenance for org.eclipse.ui.workbench
+Correct R3_4_maintenance for org.eclipse.ui.workbench.compatibility
+Correct R3_4_maintenance for org.eclipse.ui.browser
+Correct R3_4_maintenance for org.eclipse.ui.examples.job
+Correct R3_4_maintenance for org.eclipse.ui.forms
+Correct R3_4_maintenance for org.eclipse.ui.forms.examples
+Correct R3_4_maintenance for org.eclipse.ui.tests.browser
+Correct R3_4_maintenance for org.eclipse.ui.tests.forms
+Correct R3_4_maintenance for org.eclipse.ui.tutorials.rcp.part1
+Correct R3_4_maintenance for org.eclipse.ui.tutorials.rcp.part2
+Correct R3_4_maintenance for org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/tag35_fix1.sh b/eclipse.platform.ui/pass2/tag35_fix1.sh
new file mode 100644
index 0000000..205c38a
--- /dev/null
+++ b/eclipse.platform.ui/pass2/tag35_fix1.sh
@@ -0,0 +1,42 @@
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.core.commands
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.jface.snippets
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.jface.snippets
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.carbon
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.cocoa
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.contributions
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.fieldassist
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.multipageeditor
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.propertysheet
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.examples.presentation
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.presentation
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.readmetool
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.undo
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.presentations.r21
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.tests.harness
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.tests.performance
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.tests.rcp
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.tests.views.properties.tabbed
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.views.properties.tabbed
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.win32
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.workbench.compatibility
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.examples.job
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.job
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.forms.examples
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.forms.examples
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.tests.browser
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.tests.browser
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.tutorials.rcp.part3
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/tag35_pass1.sh b/eclipse.platform.ui/pass2/tag35_pass1.sh
new file mode 100644
index 0000000..6c3abf7
--- /dev/null
+++ b/eclipse.platform.ui/pass2/tag35_pass1.sh
@@ -0,0 +1,63 @@
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.core.commands
+Correct R3_5_maintenance for org.eclipse.core.databinding
+Correct R3_5_maintenance for org.eclipse.core.databinding.beans
+Correct R3_5_maintenance for org.eclipse.core.databinding.observable
+Correct R3_5_maintenance for org.eclipse.core.databinding.property
+Correct R3_5_maintenance for org.eclipse.jface
+Correct R3_5_maintenance for org.eclipse.jface.databinding
+Correct R3_5_maintenance for org.eclipse.jface.examples.databinding
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.jface.snippets
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.jface.snippets
+Correct R3_5_maintenance for org.eclipse.jface.tests.databinding
+Correct R3_5_maintenance for org.eclipse.jface.tests.databinding.conformance
+Correct R3_5_maintenance for org.eclipse.ui
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.carbon
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.cocoa
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.contributions
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.fieldassist
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.multipageeditor
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.navigator
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.propertysheet
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.examples.presentation
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.presentation
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.rcp.browser
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.readmetool
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.undo
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Correct R3_5_maintenance for org.eclipse.ui.ide
+Correct R3_5_maintenance for org.eclipse.ui.ide.application
+Correct R3_5_maintenance for org.eclipse.ui.navigator
+Correct R3_5_maintenance for org.eclipse.ui.navigator.resources
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.presentations.r21
+Correct R3_5_maintenance for org.eclipse.ui.tests
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.tests.harness
+Correct R3_5_maintenance for org.eclipse.ui.tests.navigator
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.tests.performance
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.tests.rcp
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.tests.views.properties.tabbed
+Correct R3_5_maintenance for org.eclipse.ui.views
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.views.properties.tabbed
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.win32
+Correct R3_5_maintenance for org.eclipse.ui.workbench
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.workbench.compatibility
+Correct R3_5_maintenance for org.eclipse.ui.browser
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.examples.job
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.examples.job
+Correct R3_5_maintenance for org.eclipse.ui.forms
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.forms.examples
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.forms.examples
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.tests.browser
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.tests.browser
+Correct R3_5_maintenance for org.eclipse.ui.tests.forms
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -D"06/05/2009 00:00" R3_5 org.eclipse.ui.tutorials.rcp.part3
+cvs rtag -b -rR3_5 R3_5_maintenance org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/tag35_pass2.sh b/eclipse.platform.ui/pass2/tag35_pass2.sh
new file mode 100644
index 0000000..7eba190
--- /dev/null
+++ b/eclipse.platform.ui/pass2/tag35_pass2.sh
@@ -0,0 +1,51 @@
+Correct R3_5_maintenance for org.eclipse.core.commands
+Correct R3_5_maintenance for org.eclipse.core.databinding
+Correct R3_5_maintenance for org.eclipse.core.databinding.beans
+Correct R3_5_maintenance for org.eclipse.core.databinding.observable
+Correct R3_5_maintenance for org.eclipse.core.databinding.property
+Correct R3_5_maintenance for org.eclipse.jface
+Correct R3_5_maintenance for org.eclipse.jface.databinding
+Correct R3_5_maintenance for org.eclipse.jface.examples.databinding
+Correct R3_5_maintenance for org.eclipse.jface.snippets
+Correct R3_5_maintenance for org.eclipse.jface.tests.databinding
+Correct R3_5_maintenance for org.eclipse.jface.tests.databinding.conformance
+Correct R3_5_maintenance for org.eclipse.ui
+Correct R3_5_maintenance for org.eclipse.ui.carbon
+Correct R3_5_maintenance for org.eclipse.ui.cocoa
+Correct R3_5_maintenance for org.eclipse.ui.examples.contributions
+Correct R3_5_maintenance for org.eclipse.ui.examples.fieldassist
+Correct R3_5_maintenance for org.eclipse.ui.examples.multipageeditor
+Correct R3_5_maintenance for org.eclipse.ui.examples.navigator
+Correct R3_5_maintenance for org.eclipse.ui.examples.propertysheet
+Correct R3_5_maintenance for org.eclipse.ui.examples.presentation
+Correct R3_5_maintenance for org.eclipse.ui.examples.rcp.browser
+Correct R3_5_maintenance for org.eclipse.ui.examples.readmetool
+Correct R3_5_maintenance for org.eclipse.ui.examples.undo
+Correct R3_5_maintenance for org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+Correct R3_5_maintenance for org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+Correct R3_5_maintenance for org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Correct R3_5_maintenance for org.eclipse.ui.ide
+Correct R3_5_maintenance for org.eclipse.ui.ide.application
+Correct R3_5_maintenance for org.eclipse.ui.navigator
+Correct R3_5_maintenance for org.eclipse.ui.navigator.resources
+Correct R3_5_maintenance for org.eclipse.ui.presentations.r21
+Correct R3_5_maintenance for org.eclipse.ui.tests
+Correct R3_5_maintenance for org.eclipse.ui.tests.harness
+Correct R3_5_maintenance for org.eclipse.ui.tests.navigator
+Correct R3_5_maintenance for org.eclipse.ui.tests.performance
+Correct R3_5_maintenance for org.eclipse.ui.tests.rcp
+Correct R3_5_maintenance for org.eclipse.ui.tests.views.properties.tabbed
+Correct R3_5_maintenance for org.eclipse.ui.views
+Correct R3_5_maintenance for org.eclipse.ui.views.properties.tabbed
+Correct R3_5_maintenance for org.eclipse.ui.win32
+Correct R3_5_maintenance for org.eclipse.ui.workbench
+Correct R3_5_maintenance for org.eclipse.ui.workbench.compatibility
+Correct R3_5_maintenance for org.eclipse.ui.browser
+Correct R3_5_maintenance for org.eclipse.ui.examples.job
+Correct R3_5_maintenance for org.eclipse.ui.forms
+Correct R3_5_maintenance for org.eclipse.ui.forms.examples
+Correct R3_5_maintenance for org.eclipse.ui.tests.browser
+Correct R3_5_maintenance for org.eclipse.ui.tests.forms
+Correct R3_5_maintenance for org.eclipse.ui.tutorials.rcp.part1
+Correct R3_5_maintenance for org.eclipse.ui.tutorials.rcp.part2
+Correct R3_5_maintenance for org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/tag_fix1.sh b/eclipse.platform.ui/pass2/tag_fix1.sh
new file mode 100644
index 0000000..0f21828
--- /dev/null
+++ b/eclipse.platform.ui/pass2/tag_fix1.sh
@@ -0,0 +1,13 @@
+cvs rtag -D"06/04/2010 00:00" R3_6 org.eclipse.ui.examples.job
+cvs rtag -b -rR3_6 R3_6_maintenance org.eclipse.ui.examples.job
+cvs rtag -D"06/04/2010 00:00" R3_6 org.eclipse.ui.forms.examples
+cvs rtag -b -rR3_6 R3_6_maintenance org.eclipse.ui.forms.examples
+cvs rtag -D"06/04/2010 00:00" R3_6 org.eclipse.ui.tests.browser
+cvs rtag -b -rR3_6 R3_6_maintenance org.eclipse.ui.tests.browser
+cvs rtag -b -rR3_6 R3_6_maintenance org.eclipse.ui.tests.forms
+cvs rtag -D"06/04/2010 00:00" R3_6 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -b -rR3_6 R3_6_maintenance org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -D"06/04/2010 00:00" R3_6 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -b -rR3_6 R3_6_maintenance org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -D"06/04/2010 00:00" R3_6 org.eclipse.ui.tutorials.rcp.part3
+cvs rtag -b -rR3_6 R3_6_maintenance org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/tag_pass1.sh b/eclipse.platform.ui/pass2/tag_pass1.sh
new file mode 100644
index 0000000..c7f787f
--- /dev/null
+++ b/eclipse.platform.ui/pass2/tag_pass1.sh
@@ -0,0 +1,57 @@
+Correct R3_6_maintenance for org.eclipse.core.commands
+Correct R3_6_maintenance for org.eclipse.core.databinding
+Correct R3_6_maintenance for org.eclipse.core.databinding.beans
+Correct R3_6_maintenance for org.eclipse.core.databinding.observable
+Correct R3_6_maintenance for org.eclipse.core.databinding.property
+Correct R3_6_maintenance for org.eclipse.jface
+Correct R3_6_maintenance for org.eclipse.jface.databinding
+Correct R3_6_maintenance for org.eclipse.jface.examples.databinding
+Correct R3_6_maintenance for org.eclipse.jface.snippets
+Correct R3_6_maintenance for org.eclipse.jface.tests.databinding
+Correct R3_6_maintenance for org.eclipse.jface.tests.databinding.conformance
+Correct R3_6_maintenance for org.eclipse.ui
+Correct R3_6_maintenance for org.eclipse.ui.carbon
+Correct R3_6_maintenance for org.eclipse.ui.cocoa
+Correct R3_6_maintenance for org.eclipse.ui.examples.contributions
+Correct R3_6_maintenance for org.eclipse.ui.examples.fieldassist
+Correct R3_6_maintenance for org.eclipse.ui.examples.multipageeditor
+Correct R3_6_maintenance for org.eclipse.ui.examples.navigator
+Correct R3_6_maintenance for org.eclipse.ui.examples.propertysheet
+Correct R3_6_maintenance for org.eclipse.ui.examples.presentation
+Correct R3_6_maintenance for org.eclipse.ui.examples.rcp.browser
+Correct R3_6_maintenance for org.eclipse.ui.examples.readmetool
+Correct R3_6_maintenance for org.eclipse.ui.examples.undo
+Correct R3_6_maintenance for org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+Correct R3_6_maintenance for org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+Correct R3_6_maintenance for org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Correct R3_6_maintenance for org.eclipse.ui.ide
+Correct R3_6_maintenance for org.eclipse.ui.ide.application
+Correct R3_6_maintenance for org.eclipse.ui.navigator
+Correct R3_6_maintenance for org.eclipse.ui.navigator.resources
+Correct R3_6_maintenance for org.eclipse.ui.presentations.r21
+Correct R3_6_maintenance for org.eclipse.ui.tests
+Correct R3_6_maintenance for org.eclipse.ui.tests.harness
+Correct R3_6_maintenance for org.eclipse.ui.tests.navigator
+Correct R3_6_maintenance for org.eclipse.ui.tests.performance
+Correct R3_6_maintenance for org.eclipse.ui.tests.rcp
+Correct R3_6_maintenance for org.eclipse.ui.tests.views.properties.tabbed
+Correct R3_6_maintenance for org.eclipse.ui.views
+Correct R3_6_maintenance for org.eclipse.ui.views.properties.tabbed
+Correct R3_6_maintenance for org.eclipse.ui.win32
+Correct R3_6_maintenance for org.eclipse.ui.workbench
+Correct R3_6_maintenance for org.eclipse.ui.workbench.compatibility
+Correct R3_6_maintenance for org.eclipse.ui.browser
+cvs rtag -D"06/04/2010 00:00" R3_6 org.eclipse.ui.examples.job
+cvs rtag -b -rR3_6 R3_6_maintenance org.eclipse.ui.examples.job
+Correct R3_6_maintenance for org.eclipse.ui.forms
+cvs rtag -D"06/04/2010 00:00" R3_6 org.eclipse.ui.forms.examples
+cvs rtag -b -rR3_6 R3_6_maintenance org.eclipse.ui.forms.examples
+cvs rtag -D"06/04/2010 00:00" R3_6 org.eclipse.ui.tests.browser
+cvs rtag -b -rR3_6 R3_6_maintenance org.eclipse.ui.tests.browser
+cvs rtag -b -rR3_6 R3_6_maintenance org.eclipse.ui.tests.forms
+cvs rtag -D"06/04/2010 00:00" R3_6 org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -b -rR3_6 R3_6_maintenance org.eclipse.ui.tutorials.rcp.part1
+cvs rtag -D"06/04/2010 00:00" R3_6 org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -b -rR3_6 R3_6_maintenance org.eclipse.ui.tutorials.rcp.part2
+cvs rtag -D"06/04/2010 00:00" R3_6 org.eclipse.ui.tutorials.rcp.part3
+cvs rtag -b -rR3_6 R3_6_maintenance org.eclipse.ui.tutorials.rcp.part3
diff --git a/eclipse.platform.ui/pass2/tag_pass2.sh b/eclipse.platform.ui/pass2/tag_pass2.sh
new file mode 100644
index 0000000..921f03d
--- /dev/null
+++ b/eclipse.platform.ui/pass2/tag_pass2.sh
@@ -0,0 +1,51 @@
+Correct R3_6_maintenance for org.eclipse.core.commands
+Correct R3_6_maintenance for org.eclipse.core.databinding
+Correct R3_6_maintenance for org.eclipse.core.databinding.beans
+Correct R3_6_maintenance for org.eclipse.core.databinding.observable
+Correct R3_6_maintenance for org.eclipse.core.databinding.property
+Correct R3_6_maintenance for org.eclipse.jface
+Correct R3_6_maintenance for org.eclipse.jface.databinding
+Correct R3_6_maintenance for org.eclipse.jface.examples.databinding
+Correct R3_6_maintenance for org.eclipse.jface.snippets
+Correct R3_6_maintenance for org.eclipse.jface.tests.databinding
+Correct R3_6_maintenance for org.eclipse.jface.tests.databinding.conformance
+Correct R3_6_maintenance for org.eclipse.ui
+Correct R3_6_maintenance for org.eclipse.ui.carbon
+Correct R3_6_maintenance for org.eclipse.ui.cocoa
+Correct R3_6_maintenance for org.eclipse.ui.examples.contributions
+Correct R3_6_maintenance for org.eclipse.ui.examples.fieldassist
+Correct R3_6_maintenance for org.eclipse.ui.examples.multipageeditor
+Correct R3_6_maintenance for org.eclipse.ui.examples.navigator
+Correct R3_6_maintenance for org.eclipse.ui.examples.propertysheet
+Correct R3_6_maintenance for org.eclipse.ui.examples.presentation
+Correct R3_6_maintenance for org.eclipse.ui.examples.rcp.browser
+Correct R3_6_maintenance for org.eclipse.ui.examples.readmetool
+Correct R3_6_maintenance for org.eclipse.ui.examples.undo
+Correct R3_6_maintenance for org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+Correct R3_6_maintenance for org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+Correct R3_6_maintenance for org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+Correct R3_6_maintenance for org.eclipse.ui.ide
+Correct R3_6_maintenance for org.eclipse.ui.ide.application
+Correct R3_6_maintenance for org.eclipse.ui.navigator
+Correct R3_6_maintenance for org.eclipse.ui.navigator.resources
+Correct R3_6_maintenance for org.eclipse.ui.presentations.r21
+Correct R3_6_maintenance for org.eclipse.ui.tests
+Correct R3_6_maintenance for org.eclipse.ui.tests.harness
+Correct R3_6_maintenance for org.eclipse.ui.tests.navigator
+Correct R3_6_maintenance for org.eclipse.ui.tests.performance
+Correct R3_6_maintenance for org.eclipse.ui.tests.rcp
+Correct R3_6_maintenance for org.eclipse.ui.tests.views.properties.tabbed
+Correct R3_6_maintenance for org.eclipse.ui.views
+Correct R3_6_maintenance for org.eclipse.ui.views.properties.tabbed
+Correct R3_6_maintenance for org.eclipse.ui.win32
+Correct R3_6_maintenance for org.eclipse.ui.workbench
+Correct R3_6_maintenance for org.eclipse.ui.workbench.compatibility
+Correct R3_6_maintenance for org.eclipse.ui.browser
+Correct R3_6_maintenance for org.eclipse.ui.examples.job
+Correct R3_6_maintenance for org.eclipse.ui.forms
+Correct R3_6_maintenance for org.eclipse.ui.forms.examples
+Correct R3_6_maintenance for org.eclipse.ui.tests.browser
+Correct R3_6_maintenance for org.eclipse.ui.tests.forms
+Correct R3_6_maintenance for org.eclipse.ui.tutorials.rcp.part1
+Correct R3_6_maintenance for org.eclipse.ui.tutorials.rcp.part2
+Correct R3_6_maintenance for org.eclipse.ui.tutorials.rcp.part3
diff --git a/scripts/cvs2git_prep.txt b/scripts/cvs2git_prep.txt
index 17d43d1..e45daa4 100644
--- a/scripts/cvs2git_prep.txt
+++ b/scripts/cvs2git_prep.txt
@@ -1,6 +1,139 @@
+# "fix" any of the main branches that you care about
+# you need to run this script at least twice
+# you also have to understand what tag for what date goes where.
+# you have to list all of the modules (as CVS modules from the root)
+# you care about in a modules file, ex:
+
+MODULES='org.eclipse.core.commands
+...
+org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
+org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
+org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
+org.eclipse.ui.ide
+org.eclipse.ui.ide.application
+org.eclipse.ui.navigator
+...
+'
+
+# 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
+
+
+
+
+
 # create a local cvs root
-  mkdir cvsroot
-  cd cvsroot
+# I did this on build.eclipse.org
+  mkdir cvsroot.eclipse.platform.ui
+  cd cvsroot.eclipse.platform.ui
   cvs -d :local:$(pwd) init
 
 # make a userful subdir to use
@@ -8,133 +141,31 @@
   cd eclipse.platform.ui
   mkdir bundles  examples  features  tests
 
-# "fix" any of the main branches that you care about
-# you need to run this script at least twice
-# you also have to understand what tag for what date goes where.
-# you have to list all of the modules you care about
-
-MODULES='org.eclipse.core.commands
-org.eclipse.core.databinding
-org.eclipse.core.databinding.beans
-org.eclipse.core.databinding.observable
-org.eclipse.core.databinding.property
-org.eclipse.jface
-org.eclipse.jface.databinding
-org.eclipse.jface.examples.databinding
-org.eclipse.jface.snippets
-org.eclipse.jface.tests.databinding
-org.eclipse.jface.tests.databinding.conformance
-org.eclipse.ui
-org.eclipse.ui.carbon
-org.eclipse.ui.cocoa
-org.eclipse.ui.examples.contributions
-org.eclipse.ui.examples.fieldassist
-org.eclipse.ui.examples.multipageeditor
-org.eclipse.ui.examples.navigator
-org.eclipse.ui.examples.propertysheet
-org.eclipse.ui.examples.presentation
-org.eclipse.ui.examples.rcp.browser
-org.eclipse.ui.examples.readmetool
-org.eclipse.ui.examples.undo
-org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
-org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
-org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
-org.eclipse.ui.ide
-org.eclipse.ui.ide.application
-org.eclipse.ui.navigator
-org.eclipse.ui.navigator.resources
-org.eclipse.ui.presentations.r21
-org.eclipse.ui.tests
-org.eclipse.ui.tests.harness
-org.eclipse.ui.tests.navigator
-org.eclipse.ui.tests.performance
-org.eclipse.ui.tests.rcp
-org.eclipse.ui.tests.views.properties.tabbed
-org.eclipse.ui.views
-org.eclipse.ui.views.properties.tabbed
-org.eclipse.ui.win32
-org.eclipse.ui.workbench
-org.eclipse.ui.workbench.compatibility
-'
-
-# what base tag at what date, and what branch
-TAG=R3_6
-TDATE="06/22/2010 09:00"
-BRANCH=R3_6_maintenance
-
-
-for M in $MODULES; do
-
-	if (cvs rlog -rHEAD $M/.project | grep "	${TAG}:" >/dev/null); then
-		if (cvs rlog  -r${TAG} $M/.project | grep "	${BRANCH}:" >/dev/null); then
-			echo Correct $BRANCH for $M
-		else
-			echo cvs rtag -b -r$TAG $BRANCH $M
-		fi
-	else
-		if ( cvs rlog -d "$TDATE" $M/.project | grep "selected revisions: 0" >/dev/null ); then
-			echo "Module empty on $TDATE"
-		else
-			echo cvs rtag -D\"$TDATE\" $TAG $M
-			echo cvs rtag -b -r$TAG $BRANCH $M
-		fi
-	fi
-done
-
-# Then fix the other tags.  TAG1 is a known tag (like from above :-)
-
-TAG1=R3_6
-TAG2=R3_6_1
-
-for M in $MODULES; do
-	if ! (cvs rlog -rHEAD $M/.project | grep "	${TAG2}:" >/dev/null); then
-		echo cvs rtag -R -r${TAG1} ${TAG2} $M
-	else
-		echo Already tagged ${TAG2} $M
-	fi
-done
-
 # copy over from modules
+  . modules_ui.sh
   cd /cvsroot/eclipse
-  MODULES="org.eclipse.core.commands ..."
-  for M in $MODULES; do cp -r $M /shared/eclipse/e4/git/cvs/cvsroot/eclipse.platform.ui/bundles; done
+  for M in $MODULES; do
+    cp -r $M /shared/eclipse/e4/git/cvs/cvsroot.eclipse.platform.ui/eclipse.platform.ui/bundles
+  done
 
 # move them into tests or examples, as they're all in bundles.
 
 
-# try and generate some author data
-  find org.eclipse.ui.workbench -name "*,v" -exec grep "^date.*author " {} \; >author.raw
-  grep -v "Binary file" author.raw | sed 's/^date.*author //g' | sed 's/;.*$//g' | sort -u >author.ids
-  for ID in $( cat author.ids ); do
-    ENT=$( getent passwd $ID )
-    if [ $? -eq 0 ]; then NAME=$( echo $ENT | cut -f5 -d: ); else NAME=$ID; fi
-    echo "'$ID' : ('$NAME', '$ID@eclipse.org')," >>author.py
-  done
-
-  # or using LDAP, better email addresses
-  for ID in $( cat author.ids ); do
-    ldapsearch -x -b "dc=eclipse,dc=org" -s sub "(uid=$ID)" >tmp.txt
-    NAME=$ID
-    EMAIL=$ID
-    if grep "numEntries: 1\$" tmp.txt >/dev/null; then
-      NAME=$( grep ^cn: tmp.txt | sed 's/cn: //g' )
-      #EMAIL=$( grep ^mail: tmp.txt | sed 's/mail: //g' )
-    fi
-    echo "'$ID' : ('$NAME', '$EMAIL')," >>author.py
-  done
 
 # clean the CVS repo of links
   find cvsroot -type l|xargs -n 1 rm
 
+# back on my dev machine I need to copy the cvsroot so I can use it.
+#
+
 
 # get the cvs2git tool
   svn co --username=guest --password="" http://cvs2svn.tigris.org/svn/cvs2svn/trunk cvs2svn-trunk
 
 # run the cvs2git tool
-  cvs2svn-trunk/cvs2git --options=cvs2git_ui_and_e4.options
+  cvs2svn-trunk/cvs2git --options=org.eclipse.migration/eclipse.platform.ui/pass2/cvs2git.options
 
 # create a git repo
-  #git init --bare --shared eclipse.platform.ui.git #final repo
   git init --shared eclipse.platform.ui #tmp repo
 
 # try the fast import
@@ -178,9 +209,30 @@
 
 #
 #
-#  All of the stuff below are like extra steps.
+#  All of the stuff below are extra steps.
 #
 
+# try and generate some author data to include in the options file
+  find org.eclipse.ui.workbench -name "*,v" -exec grep "^date.*author " {} \; >author.raw
+  grep -v "Binary file" author.raw | sed 's/^date.*author //g' | sed 's/;.*$//g' | sort -u >author.ids
+  for ID in $( cat author.ids ); do
+    ENT=$( getent passwd $ID )
+    if [ $? -eq 0 ]; then NAME=$( echo $ENT | cut -f5 -d: ); else NAME=$ID; fi
+    echo "'$ID' : ('$NAME', '$ID@eclipse.org')," >>author.py
+  done
+
+  # or using LDAP, better email addresses
+  for ID in $( cat author.ids ); do
+    ldapsearch -x -b "dc=eclipse,dc=org" -s sub "(uid=$ID)" >tmp.txt
+    NAME=$ID
+    EMAIL=$ID
+    if grep "numEntries: 1\$" tmp.txt >/dev/null; then
+      NAME=$( grep ^cn: tmp.txt | sed 's/cn: //g' )
+      #EMAIL=$( grep ^mail: tmp.txt | sed 's/mail: //g' )
+    fi
+    echo "'$ID' : ('$NAME', '$EMAIL')," >>author.py
+  done
+
 
 # add it to a bare repo
   git remote bareLocal ssh://e4Build@build.eclipse.org/shared/eclipse/e4/git/cvs/eclipse.platform.ui.git
diff --git a/scripts/retag_cvs.sh b/scripts/retag_cvs.sh
old mode 100644
new mode 100755
index d412c47..58ddb2e
--- a/scripts/retag_cvs.sh
+++ b/scripts/retag_cvs.sh
@@ -1,58 +1,22 @@
 #!/bin/bash
 
-MODULES='org.eclipse.core.commands
-org.eclipse.core.databinding
-org.eclipse.core.databinding.beans
-org.eclipse.core.databinding.observable
-org.eclipse.core.databinding.property
-org.eclipse.jface
-org.eclipse.jface.databinding
-org.eclipse.jface.examples.databinding
-org.eclipse.jface.snippets
-org.eclipse.jface.tests.databinding
-org.eclipse.jface.tests.databinding.conformance
-org.eclipse.ui
-org.eclipse.ui.carbon
-org.eclipse.ui.cocoa
-org.eclipse.ui.examples.contributions
-org.eclipse.ui.examples.fieldassist
-org.eclipse.ui.examples.multipageeditor
-org.eclipse.ui.examples.navigator
-org.eclipse.ui.examples.propertysheet
-org.eclipse.ui.examples.presentation
-org.eclipse.ui.examples.rcp.browser
-org.eclipse.ui.examples.readmetool
-org.eclipse.ui.examples.undo
-org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
-org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
-org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
-org.eclipse.ui.ide
-org.eclipse.ui.ide.application
-org.eclipse.ui.navigator
-org.eclipse.ui.navigator.resources
-org.eclipse.ui.presentations.r21
-org.eclipse.ui.tests
-org.eclipse.ui.tests.harness
-org.eclipse.ui.tests.navigator
-org.eclipse.ui.tests.performance
-org.eclipse.ui.tests.rcp
-org.eclipse.ui.tests.views.properties.tabbed
-org.eclipse.ui.views
-org.eclipse.ui.views.properties.tabbed
-org.eclipse.ui.win32
-org.eclipse.ui.workbench
-org.eclipse.ui.workbench.compatibility
-'
+if (( $# != 4 )); then
+	echo "USAGE: $0 <module_file> TAG \"MM/DD/YYYY HH:mm\" BRANCH"
+	exit 1
+fi
 
-#M=org.eclipse.core.commands
-#M=org.eclipse.jface
-#M=org.eclipse.ui.workbench
-#M=org.eclipse.ui.examples.views.properties.tabbed
+
+if [ -r "$1" ]; then
+	. "$1"
+else
+	echo "USAGE: $0 <module_file> TAG \"MM/DD/YYYY HH:mm\" BRANCH"
+	exit 1
+fi
 
 # what base tag at what date, and what branch
-TAG=R3_6
-TDATE="06/22/2010 09:00"
-BRANCH=R3_6_maintenance
+TAG="$2"
+TDATE="$3"
+BRANCH="$4"
 
 
 for M in $MODULES; do
@@ -65,7 +29,7 @@
 		fi
 	else
 		if ( cvs rlog -d "$TDATE" $M/.project | grep "selected revisions: 0" >/dev/null ); then
-			echo "Module empty on $TDATE"
+			echo "Module $M empty on $TDATE"
 		else
 			echo cvs rtag -D\"$TDATE\" $TAG $M
 			echo cvs rtag -b -r$TAG $BRANCH $M
diff --git a/scripts/subtag_cvs.sh b/scripts/subtag_cvs.sh
old mode 100644
new mode 100755
index fb24e56..28df3ab
--- a/scripts/subtag_cvs.sh
+++ b/scripts/subtag_cvs.sh
@@ -1,63 +1,32 @@
 #!/bin/bash
 
-MODULES='org.eclipse.core.commands
-org.eclipse.core.databinding
-org.eclipse.core.databinding.beans
-org.eclipse.core.databinding.observable
-org.eclipse.core.databinding.property
-org.eclipse.jface
-org.eclipse.jface.databinding
-org.eclipse.jface.examples.databinding
-org.eclipse.jface.snippets
-org.eclipse.jface.tests.databinding
-org.eclipse.jface.tests.databinding.conformance
-org.eclipse.ui
-org.eclipse.ui.carbon
-org.eclipse.ui.cocoa
-org.eclipse.ui.examples.contributions
-org.eclipse.ui.examples.fieldassist
-org.eclipse.ui.examples.multipageeditor
-org.eclipse.ui.examples.navigator
-org.eclipse.ui.examples.propertysheet
-org.eclipse.ui.examples.presentation
-org.eclipse.ui.examples.rcp.browser
-org.eclipse.ui.examples.readmetool
-org.eclipse.ui.examples.undo
-org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.article
-org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.hockeyleague
-org.eclipse.ui.examples.views.properties.tabbed/org.eclipse.ui.examples.views.properties.tabbed.logic
-org.eclipse.ui.ide
-org.eclipse.ui.ide.application
-org.eclipse.ui.navigator
-org.eclipse.ui.navigator.resources
-org.eclipse.ui.presentations.r21
-org.eclipse.ui.tests
-org.eclipse.ui.tests.harness
-org.eclipse.ui.tests.navigator
-org.eclipse.ui.tests.performance
-org.eclipse.ui.tests.rcp
-org.eclipse.ui.tests.views.properties.tabbed
-org.eclipse.ui.views
-org.eclipse.ui.views.properties.tabbed
-org.eclipse.ui.win32
-org.eclipse.ui.workbench
-org.eclipse.ui.workbench.compatibility
-'
+if (( $# != 3 )); then
+	echo "USAGE: $0 <module_file> TAG NEXT_TAG"
+	exit 1
+fi
 
-#M=org.eclipse.core.commands
-#M=org.eclipse.jface
-#M=org.eclipse.ui.workbench
-#M=org.eclipse.ui.examples.views.properties.tabbed
+
+if [ -r "$1" ]; then
+	. "$1"
+else
+	echo "USAGE: $0 <module_file> TAG NEXT_TAG"
+	exit 1
+fi
+
 
 # what base tag at what date, and what branch
-TAG1=R3_6_1
-TAG2=R3_6_2
+TAG1="$2"
+TAG2="$3"
 
 for M in $MODULES; do
-	if ! (cvs rlog -rHEAD $M/.project | grep "	${TAG2}:" >/dev/null); then
-		echo cvs rtag -R -r${TAG1} ${TAG2} $M
+	if (cvs rlog -rHEAD $M/.project | grep "	${TAG1}:" >/dev/null); then
+		if ! (cvs rlog -rHEAD $M/.project | grep "	${TAG2}:" >/dev/null); then
+			echo cvs rtag -R -r${TAG1} ${TAG2} $M
+		else
+			echo Already tagged ${TAG2} $M
+		fi
 	else
-		echo Already tagged ${TAG2} $M
+		echo "Module $M empty or not tagged, skipping"
 	fi
 done