Error converting a branch from Perforce to CVS
Dave Rehring <[email protected]> Fri, 03 Dec 2004 13:04:26 -0800
| Newsgroups | gmane.comp.version-control.revml |
|---|---|
| Message-ID | <BDD614DA.24FB8%[email protected]> |
I'm exporting part of our Perforce depot to CVS, and am having trouble
exporting a branch of code.
In the Perforce depot, the files are organized like this:
//depot/Shared_Files/
//depot/MainCodeLine/
//depot/MainCodeLineBranch/BranchA/
When using Perforce on the main code line, we use a client that maps like
this:
/MainCodeLine/
/MainCodeLine/Shared_Files/
[so on the local disk, the files in Shared_Files appears 'within'
MainCodeLine]
When using Perforce on the branch, we use a client that just maps:
/MainCodeLineBranch/BranchA/
The branch spec mapped Shared_Files within MainCodeLine at the right spot as
part of doing the branch.
Now, how should I set up the filter for vcp to get this in CVS so the
locations in CVS match how it should be on the local disk.
I've tried:
Shared_Files/(...)<(...)> MainCodeLine/$2/Shared_Files/$1
MainCodeLine/(...)<(...)> MainCodeLine/$2/$1
MainCodeLineBranch/BranchA/(...)<(...)> MainCodeLineBranch/$2/$1
[files wind up mapped to CVS wrong and fails on the first branched file]
Shared_Files/(...)<(...)> MainCodeLine/Shared_Files/$1
MainCodeLine/(...)<(...)> MainCodeLine/$1
MainCodeLineBranch/BranchA/(...)<(...)> MainCodeLineBranch/$1
Shared_Files/(...)<(...)> MainCodeLine/Shared_Files/$1<$2>
MainCodeLine/(...)<(...)> MainCodeLine/$1<$2>
MainCodeLineBranch/BranchA/(...)<(...)> MainCodeLineBranch/$1<$2>
Shared_Files/(...)<> MainCodeLine/Shared_Files/$1
MainCodeLine/(...)<> MainCodeLine/$1
MainCodeLineBranch/BranchA/(...)<...> MainCodeLineBranch/$1
Shared_Files/(...)<> MainCodeLine/Shared_Files/$1
MainCodeLine/(...)<> MainCodeLine/$1
MainCodeLineBranch/BranchA/(...)<Main...> MainCodeLineBranch/$1
I've even tried doing it separately, the main line first, then the branch:
Shared_Files/(...)<> MainCodeLine/Shared_Files/$1
MainCodeLine/(...)<> MainCodeLine/$1
MainCodeLineBranch/BranchA/(...)<...> MainCodeLineBranch/$1
Doing both the main line and the branch at the same time generally fail when
the first branched file is processed, when it seems to try to tag the file
before it has been added to the CVS repository.
My latest try:
Shared_Files/(...)<(...)> MainCodeLine/Shared_Files/$1
MainCodeLine/(...)<(...)> MainCodeLine/$1
MainCodeLineBranch/BranchA/(...)<...> MainCodeLineBranch/$1
Ended after about 6 hours with:
Unexpected stderr from 'cvs':
cvs: cvs [tag aborted]: correct the above errors first!
Cvs -Q -z9 -d/home/dave/test/testcvs tag -b -r1.8
tag_//depot/MainCodeLineBranch/BranchA/Folder1/
cvstest/MainCodeLineBranch/Folder1/File1.cp returned 1 not 0
stderr:
cvs [tag aborted]: correct the above errors first!
From vcp's log file it does:
Mkdir tempfolder/.../MainCodeLineBranch
Cvs add -Q -z9 -d/home/dave/test/testcvs tempfolder/.../MainCodeLineBranch
Mkdir tempfolder/.../MainCodeLineBranch/Folder1
Cvs add -Q -z9 -d/home/dave/test/testcvs
(continued)tempfolder/.../MainCodeLineBranch/Folder1
Cvs -Q -z9 -d/home/dave/test/testcvs tag -b -r1.8
(continued)tag_//depot/MainCodeLineBranch/BranchA/Folder1/
(continued)cvstest/MainCodeLineBranch/Folder1/File1.cp
Then the same failure codes listed above.
It appears that vcp isn't retrieving the branched file from Perforce and
adding it to cvs before trying to tag it.
I'm using the version of vcp that can be checked out via p4 [not the
pre-packaged ones], with two fixes to enabled the p4 source to recognized
apple files as binary, and the cvs destination to treat xtext as plain text.
Any idea's on how I should configure it to make this work?
Later,
--
David Rehring Psychos do not explode when light hits
VP of Research and Development them, no matter how crazy they are...
Atimi Software, Inc.
www.atimi.com And totally insane guy!