[cvsnt] Help with Ant task wrapping cvs import

jlcarpenter at household.com jlcarpenter at household.com
Wed Sep 11 01:30:55 BST 2002


==========================
Overview:
==========================
I am creating an Ant task that merges multiple vendor branches in CVS into
the main branch.

I am having a problem getting cvs to ignore a problem file during an update
with no success.
I recognize that strictly speaking this is really  a cvs issue.

I am developing the ant task using the cvs client supplied with the cvsnt
server.

==========================
Problem statement:
=========================
Assume there are two vendor branches (1.1.3 and 1.1.4) tagged VendorBranchA
and VendorBranchB respectively.
Imports into each branch are tagged with release tags VendorA_X and
VendorB_X respectively.  X is an integer counter incremented for each
import for a specific vendor branch.

i.e.:
day1)
prompt>cvs import -b 1.1.3 mainpackage VendorBranchA VendorA_1
prompt>cvs import -b 1.1.4 mainpackage VendorBranchB VendorB_1

day2)
prompt>cvs import -b 1.1.3 mainpackage VendorBranchA VendorA_2

day3)
prompt>cvs import -b 1.1.3 mainpackage VendorBranchA VendorA_3
prompt>cvs import -b 1.1.4 mainpackage VendorBranchB VendorB_2

Let there be a file mainpackage/coolstuff/test4.txt that exists on branch
VendorBranchA at the VendorA_2 tag location, but is removed at the
VendorA_3 tag location.
Let the same file name mainpackage/coolstuff/test4.txt exist on branch
VendorBranchB at the VendorB_1 and VendorB_2 tag locations.

During an automated merge between day3 and day2 the following update
commands are issued in the work directory where the "mainpackage" package
has been checked out.

X:\junk2>cvs update -j VendorA_2 -j VendorA_3
cvs update: Updating mainpackage
cvs update: Updating mainpackage/coolstuff
cvs update: scheduling mainpackage/coolstuff/test4.txt for removal

X:\junk2>cvs update -j VendorB_1 -j VendorB_2
cvs update: Updating mainpackage
cvs update: Updating mainpackage/coolstuff
R mainpackage/coolstuff/test4.txt
cvs [update aborted]: cannot open test4.txt for copying: No such file or
directory

Upon close inspection the reason for the failure becomes apparent.  The
troublesome file mainpackage/coolstuff/test4.txt is scheduled for removal
by the first update command (this includes being erased from the working
area).  When the second update command tries to update the same file it is
no longer available.



More information about the cvsnt mailing list
Download the latest CVSNT, TortosieCVS, WinCVS etc. for Windows 8 etc.
@CVSNT on Twitter   CVSNT on Facebook