[p4] cvs2p4 and perfmerge2.pl

Jeff A. Bowles jab at pobox.com
Mon Dec 19 09:30:01 PST 2005 

I'd ask Tech Support.

I'd bet that either you had filenames common to both imported  
checkpoints
("how do you merge the content files?") or didn't copy/move all of  
the imported
content files.

	-Jeff Bowles

On Dec 19, 2005, at 8:23 AM, Schlueter, Michael wrote:

> This is the complete error list issued by the p4 verify -qu //...  
> command.
> I changed some file names for privacy reasons, but the perforce  
> specific data is unchanged.
> You can see that all files belong to the "depot" depot, but we have  
> a few other depots as well.
> The imported cvs files reside in a new depot.
>
> //depot/KDiv-letter/doc/Extern/letter für Kassen V1.2.pdf#1 - add  
> change 2652 (binary) 48BCA65A9FA7A0F1265862A4C477C1D1 MISSING!
> //depot/KDiv-letter/doc/Spezifikation/PIN-Änderung.doc#1 - add  
> change 2652 (binary) 62BF5F8D42D899F5EDE989A2A7A1222A MISSING!
> //depot/Kundendatenbank/Datenbank/Dokumente/Spezifikation/ 
> Mengengerüst.xls#1 - add change 1983 (binary)  
> 5C56FF1030F4A29015E591A624582218 MISSING!
> //depot/Logos/ASB/asb2000transparent_schwarzefüsse.ai#1 - add  
> change 10268 (text) E9972CF09A4DD12D979EB632C8A4ABC2 MISSING!
> //depot/Logos/Bildgrößen.txt#1 - add change 6522 (text)  
> 6C8FA54A9CF8A2EA79852C6AB127EA82 MISSING!
> //depot/Logos/Icons/XP Folders/Mi Español XP.ico#1 - add change  
> 8767 (binary) 63F20D596EA7996D7786F5979A642617 MISSING!
> //depot/Logos/myProject/Schlüssel1.psd#1 - add change 8767 (binary)  
> FD522521AF2BC238E6F8901460FE97F0 MISSING!
> //depot/Logos/myProject/Schlüssel2.psd#1 - add change 8767 (binary)  
> E1BAC66629EAF62BBF191260C4EEE23B MISSING!
> //depot/Logos/myProject/Schlüssel2_Transparent.psd#1 - add change  
> 8767 (binary) 4598021AC3CA352EE7DC44DEEE33F471 MISSING!
> //depot/Logos/myProject/Schlüssel3.psd#1 - add change 8767 (binary)  
> E6ED49ED7BB85BBD61D683EE3F8AD0A3 MISSING!
> //depot/Logos/myProject/Schlüssel3_Transparent.psd#1 - add change  
> 8767 (binary) B3D1A474D23517F08903857EDBC8A09D MISSING!
> //depot/Logos/Sci alt/SCI_ACCESS_WIN/SCI_ACCESS_O®_WIN.exe#1 - add  
> change 6522 (xbinary) F8EE3A4071E29758264E465BDB3053DA MISSING!
> //depot/Logos/Sci alt/SCI_ATTRIBUTE_WIN/SCI_ATTRIBUTE_O®_WIN.exe#1  
> - add change 6522 (xbinary) 699FD804517198B697D5A68B68118BAA MISSING!
> //depot/Logos/Sci alt/SCI_FILE_WIN/SCI_FILE_O®_WIN.exe#1 - add  
> change 6522 (xbinary) EF2192A618FF1AECC787A9E3DFE0CB4F MISSING!
> //depot/Logos/Sci alt/SCI_IDENTITY_WIN/SCI_IDENTITY_O®.exe#1 - add  
> change 6522 (xbinary) B56688E45E35429AEE7CC9A93351B61B MISSING!
> //depot/Logos/Sci alt/SCI_IDENTITY_WIN/SCI_IDENTITY_O®/bmp/ 
> SCI_IDENT_O®_4c.bmp#1 - add change 6522 (binary)  
> 3AFABAA1A7AA6AD8B7593CE6F198DC65 MISSING!
> //depot/Logos/Sci alt/SCI_IDENTITY_WIN/SCI_IDENTITY_O®/bmp/ 
> SCI_IDENT_O®_Fond_4c.bmp#1 - add change 6522 (binary)  
> 5669BE7BA129BA79EB7BBC268801ED18 MISSING!
> //depot/Logos/Sci alt/SCI_IDENTITY_WIN/SCI_IDENTITY_O®/bmp/ 
> SCI_IDENT_O®_Fond_SF.bmp#1 - add change 6522 (binary)  
> 5669BE7BA129BA79EB7BBC268801ED18 MISSING!
> //depot/Logos/Sci alt/SCI_IDENTITY_WIN/SCI_IDENTITY_O®/bmp/ 
> SCI_IDENT_O®_SF.bmp#1 - add change 6522 (binary)  
> 3AFABAA1A7AA6AD8B7593CE6F198DC65 MISSING!
> //depot/Logos/Sci alt/SCI_IDENTITY_WIN/SCI_IDENTITY_O®/bmp/ 
> SCI_IDENT_O®_SW.bmp#1 - add change 6522 (binary)  
> 164126D438ABDF92D35F6FD321EFE718 MISSING!
> //depot/Logos/Sci alt/SCI_IDENTITY_WIN/SCI_IDENTITY_O®/eps/ 
> SCI_IDENT_O®_4c.EPS#1 - add change 6522 (binary)  
> 72E2BA6F9D8A7481FD9EA39A2767AAF6 MISSING!
> //depot/Logos/Sci alt/SCI_IDENTITY_WIN/SCI_IDENTITY_O®/eps/ 
> SCI_IDENT_O®_Fond_4c.EPS#1 - add change 6522 (binary)  
> 419D66E073C4D60B52500F937F2C3172 MISSING!
> //depot/Logos/Sci alt/SCI_IDENTITY_WIN/SCI_IDENTITY_O®/eps/ 
> SCI_IDENT_O®_Fond_SF.EPS#1 - add change 6522 (binary)  
> 33AB4B60A86B3E5AC9548C5B02E864D9 MISSING!
> //depot/Logos/Sci alt/SCI_IDENTITY_WIN/SCI_IDENTITY_O®/eps/ 
> SCI_IDENT_O®_SF.EPS#1 - add change 6522 (binary)  
> F631124A1A9D9F1F1C925ACB44C8781D MISSING!
> //depot/Logos/Sci alt/SCI_IDENTITY_WIN/SCI_IDENTITY_O®/eps/ 
> SCI_IDENT_O®_SW.EPS#1 - add change 6522 (binary)  
> 1DBAA2676D8126367D9C343B4D434FBD MISSING!
> //depot/Logos/Sci alt/SCI_IDENTITY_WIN/SCI_IDENTITY_O®/wmf/ 
> SCI_IDENT_O®_4c.WMF#1 - add change 6522 (binary)  
> B1B3B1839E0A5514255329B8FA7137C2 MISSING!
> //depot/Logos/Sci alt/SCI_IDENTITY_WIN/SCI_IDENTITY_O®/wmf/ 
> SCI_IDENT_O®_Fond_4c.WMF#1 - add change 6522 (binary)  
> 9062B7FC518E2C1394F50299337871FB MISSING!
> //depot/Logos/Sci alt/SCI_IDENTITY_WIN/SCI_IDENTITY_O®/wmf/ 
> SCI_IDENT_O®_Fond_SF.WMF#1 - add change 6522 (binary)  
> 9062B7FC518E2C1394F50299337871FB MISSING!
> //depot/Logos/Sci alt/SCI_IDENTITY_WIN/SCI_IDENTITY_O®/wmf/ 
> SCI_IDENT_O®_SF.WMF#1 - add change 6522 (binary)  
> B1B3B1839E0A5514255329B8FA7137C2 MISSING!
> //depot/Logos/Sci alt/SCI_IDENTITY_WIN/SCI_IDENTITY_O®/wmf/ 
> SCI_IDENT_O®_SW.WMF#1 - add change 6522 (binary)  
> 5F89CFCF561882A74B735173D432C001 MISSING!
> //depot/Logos/Sci alt/SCI_INSIDER_WIN/SCI_INSIDER_O®.exe#1 - add  
> change 6522 (xbinary) CF05CE33D77844FF8AA98C6F2AFF436E MISSING!
> //depot/Logos/Sci alt/SCI_LOGIN_WIN/SCI_LOGIN_O®.exe#1 - add change  
> 6522 (xbinary) BE8180C601863AFEE1D6B8DC1B5852BB MISSING!
> //depot/Logos/Sci alt/SCI_MAIL_O®_4c.bmp#1 - add change 6522  
> (binary) 0F7155CFDEF92C657A6203361D3E7262 MISSING!
> //depot/Logos/Sci alt/SCI_MAIL_O®_Fond_4c.bmp#1 - add change 6522  
> (binary) 584EF4E3FC85A4C4317592868D2D26E9 MISSING!
> //depot/Logos/Sci alt/SCI_MAIL_O®_Fond_SF.bmp#1 - add change 6522  
> (binary) 584EF4E3FC85A4C4317592868D2D26E9 MISSING!
> //depot/Logos/Sci alt/SCI_MAIL_O®_SF.bmp#1 - add change 6522  
> (binary) 0F7155CFDEF92C657A6203361D3E7262 MISSING!
> //depot/Logos/Sci alt/SCI_MAIL_O®_SW.bmp#1 - add change 6522  
> (binary) D14C1132EB8CD2E31EA9389CD8E021F0 MISSING!
> //depot/Logos/Sci alt/SCI_MAIL_WIN/SCI_MAIL_O®_WIN.exe#1 - add  
> change 6522 (xbinary) 25CED8E6C8B3BA308098535FDDF8AB70 MISSING!
> //depot/Logos/Sci alt/SCI_ORIGIN_WIN/SCI_ORIGIN_O®.exe#1 - add  
> change 6522 (xbinary) F538B1BA7D0B7FADACC59966A9B0AEEF MISSING!
> //depot/Logos/Sci alt/SCI_PLATFORM_WIN/SCI_PLATFORM_O®.exe#1 - add  
> change 6522 (xbinary) FBB2672ED9F5EBCE0CA6ACDE42CF358D MISSING!
> //depot/Logos/Sci alt/SCI_START_WIN/SCI_START_O®.exe#1 - add change  
> 6522 (xbinary) 6584B4AE313C066E5A0673E77D1B8D36 MISSING!
> //depot/Logos/Sci alt/SCI_STATUS_WIN/SCI_STATUS_O®_WIN.exe#1 - add  
> change 6522 (xbinary) 1646A5522478EB93F337A10A67141174 MISSING!
> //depot/Logos/Sci alt/SCI_SYSTEMATICS_WIN/SCI_SYSTEMA_O®_WIN.exe#1  
> - add change 6522 (xbinary) DEEAF04215221B39FD0B0A3107715343 MISSING!
> //depot/Logos/Sci alt/SCI_TRANSACTION_WIN/ 
> SCI_TRANSACTIO_O®WIN.exe#1 - add change 6522 (xbinary)  
> 9893544BE2C80FF77F13DF6609800F6F MISSING!
> //depot/Logos/Sci alt/SCI_TUNNEL_WIN/SCI_TUNNEL_O®_WIN.exe#1 - add  
> change 6522 (xbinary) 2BDC6459EC2703E98AB0769F72029D84 MISSING!
> //depot/Logos/Sci alt/SCI_WIN/SCI_O®_WIN.exe#1 - add change 6522  
> (xbinary) B084F8E544AA4C047409F32D6208817D MISSING!
> //depot/Database/quelle/GESCHÄFTSBEREICHE.fmb#1 - add change 1984  
> (binary) 4039164AA76C1CE9D7ED600170CADD9C MISSING!
> //depot/Database/quelle/MENÜ.fmb#1 - add change 1984 (binary)  
> DB739DB733DF153F2C6F9FF26143C25F MISSING!
> //depot/Database/quelle/MENÜBERECHTIGUNGEN.fmb#1 - add change 1984  
> (binary) 5202B0FBC90012CC85EBA4DF4604817E MISSING!
> //depot/Database/quelle/MENÜFUNKTIONEN.fmb#1 - add change 1984  
> (binary) FFB4CBF497D3081CB1CC1A6F1BE87B5D MISSING!
> //depot/Sci/SharedComponents/ConfigModule/release/Gui/res/ 
> Logo_klein_weiß.bmp#1 - branch change 1706 (binary)  
> 058FF0B63805B6CD643BF468CF194E38 MISSING!
> //depot/Sci/SharedComponents/ConfigModule/st_perforce/Gui/res/ 
> Logo_klein_weiß.bmp#2 - integrate change 1949 (binary)  
> 058FF0B63805B6CD643BF468CF194E38 MISSING!
> //depot/Sci/SharedComponents/ConfigModule/st_perforce/Gui/res/ 
> Logo_klein_weiß.bmp#1 - branch change 1838 (binary)  
> 058FF0B63805B6CD643BF468CF194E38 MISSING!
> //depot/Sci/card/Dokumente/Planung/Anhang A PH0.999k - CR18.doc#1 -  
> branch change 10562 (binary) 5363FC11AAB840C31E579C22213FAB1F MISSING!
> //depot/Sci/card/Dokumente/Planung/Anhang A PH0.999k - CR18.pdf#1 -  
> branch change 10562 (binary) A294004659C21B999D54B1122CA6EDB5 MISSING!
>
> Michael
>
>> -----Ursprüngliche Nachricht-----
>> Von: Smith, Jeff [mailto:jsmith at medplus.com]
>> Gesendet: Montag, 19. Dezember 2005 15:47
>> An: Schlueter, Michael; perforce-user at perforce.com
>> Betreff: RE: [p4] cvs2p4 and perfmerge2.pl
>>
>> It might help if you would post the complete verify error.
>>
>> Jeff
>>
>> -----Original Message-----
>> From: perforce-user-bounces at perforce.com
>> [mailto:perforce-user-bounces at perforce.com] On Behalf Of
>> Schlueter, Michael
>> Sent: Monday, December 19, 2005 4:44 AM
>> To: perforce-user at perforce.com
>> Subject: [p4] cvs2p4 and perfmerge2.pl
>>
>>
>> We just started to merge a subsidiary CVS to our main
>> perforce server.
>> Our plan was (is) to setup a local perforce server and using
>> cvs2p4 to convert the CVS projects. This worked pretty well.
>> As a second step I tried to merge the local perforce depot
>> into your main perforce server using the perfmerge2.pl
>> script. The script merged the two checkpoints without any
>> warning and I was able to restore a merged database from the
>> checkpoint. However the p4 verify command claims that some
>> revisions of the main depot are missing, so that it is not
>> able to very the digest.
>> I also tried to access these revisions with the p4 print
>> command and the server was not able to access it. It seems
>> that 4 changes out of 13000 are somehow corrupted. All
>> affected changes are add or branch actions, but there is
>> noting else which is common between these changes.
>>
>> Any ideas or alternative merge strategies are welcome.
>>
>> Regards,
>> Michael Schlueter
>>
>>
>>
>>
>>
>> _______________________________________________
>> perforce-user mailing list  -  perforce-user at perforce.com
>> http://maillist.perforce.com/mailman/listinfo/perforce-user
>>
>
> _______________________________________________
> perforce-user mailing list  -  perforce-user at perforce.com
> http://maillist.perforce.com/mailman/listinfo/perforce-user

More information about the perforce-user mailing list