RE: Please help: need to find what is in branch "x" that is not in branch "y"; complicated scenario

[Masters, Matt]

 

 

---

From: Masters, Matt
Sent: Friday, March 07, 2008 3:01 PM
To: 'address@hidden'
Subject: Please help: need to find what is in branch "x" that is not in branch "y"; complicated scenario

 

I would recommend trying to use ANT http://ant.apache.org/   The reason I recommend ANT is because of <CvsTagDiff>, which if I understand your problem correctly this will help.

 

I am not going to go through getting ANT up and running, it is pretty straight forward, but here is an example of what the target that you will need to create will look like:

 

    <!-- =================================================================== -->

    <!-- CVS diff                                                            -->

    <!-- =================================================================== -->

    <target name="cvs_diff">

 

    <!-- START: MODIFY THESE VALUES -->

        <property name="ant.home.dir"    value="MODIFY WHATEVER TO THE HOME DIR OF ANT"/>

        <property name="cvs.module"      value="MODIFY WHATEVER TO THE CVS MODULE NAME"/>

        <property name="cvs.tag1"        value="MODIFY WHATEVER CVS TAG 1 IS"/>

        <property name="cvs.tag2"        value="MODIFY WHATEVER CVS TAG 2 IS"/>

        <property name="cvsweb"          value="WHATEVER YOUR CVSWEB IS THIS IS NOT NECCESSARY"/>

        <property name="cvs.report.dir"  value="C:\tmp"/>

    <!-- END: MODIFY THESE VALUES -->

 

      <property name="cvs.diff.file"   value="cvs_diff-${cvs.module}"/>

      <property name="cvs.diff.xml"    value="${cvs.report.dir}/xml/${cvs.diff.file}.xml"/>

      <property name="cvs.diff.html"   value="${cvs.report.dir}/html/${cvs.diff.file}.html"/>

 

        <echo message="ant.home.dir   = ${ant.home.dir}"/>

        <echo message="cvs.module     = ${cvs.module}"/>

        <echo message="cvs.tag1       = ${cvs.tag1}"/>

        <echo message="cvs.tag2       = ${cvs.tag2}"/>

        <echo message="cvsweb         = ${cvsweb}"/>

        <echo message="cvs.report.dir = ${cvs.report.dir}"/>

      <echo message="cvs.diff.file  = ${cvs.diff.file}"/>

      <echo message="cvs.diff.xml   = ${cvs.diff.xml}"/>

      <echo message="cvs.diff.html  = ${cvs.diff.html}"/>

 

        <cvstagdiff

            destfile="${cvs.diff.xml}"

            package="${cvs.module}"

            startTag="${cvs.tag1}"

            endTag="${vvs.tag2}"

        />

 

        <xslt in   ="${cvs.diff.xml}"

              out  ="${cvs.diff.html}"

              style="${ant.home.dir}/etc/tagdiff.xsl">

                 <param name="title"  _expression_="${cvs.module} TagDiff"/>

                 <param name="tag1"   _expression_="${cvs.tag1}"/>

                 <param name="tag2"   _expression_="${cvs.tag2}"/>

                 <param name="module" _expression_="${cvs.module}"/>

                 <param name="cvsweb" _expression_="${cvsweb}"/>

        </xslt>

 

    </target>

 

 

 

Hope it helps,

Matt

**********************************************************************

This email and any files transmitted with it are confidential and

intended solely for the use of the individual or entity to whom they

are addressed. If you have received this email in error please notify

the system manager.

This footnote also confirms that this email message has been swept

for the presence of computer viruses.

**********************************************************************