Re: VCP vs. Branching (p4 -> p4)
Barrie Slaymaker <[email protected]> Thu, 15 Dec 2005 09:16:25 -0500
| Newsgroups | gmane.comp.version-control.revml |
|---|---|
| Message-ID | <[email protected]> |
This is a multi-part message in MIME format.
--===============1512609055==
Content-type: multipart/alternative;
boundary=------------000505070405030002050502
This is a multi-part message in MIME format.
--------------000505070405030002050502
Content-Type: text/plain; charset=ISO-8859-1; format=flowed
Content-Transfer-Encoding: 7bit
I think you'd have to write a VCP filter module to do that because the
source repository would still need to play back the integrations while
the destination would need to be told to do an add for branch creation
or an edit for a merge-in operation.
I take it this is the VCP executable from the public depot? We've made
some improvements to the handling of branching and merging since then,
can you post VCP's banner line and a detailed p4 filelog for
//kingkong-xenon-playground/KK-JadePerforce/jade/Main/WinEditors/Sources/DATaControl/DATCCompression.h
including integration records so I can add a similar scenario to VCP's
test suite?
Thanks,
Barrie
Nicolas Beaufils wrote:
> Hello,
>
>
>
> I'm trying to use VCP to move a depot from one instance of PERFORCE
>
> to another. The source depot has some branch/integrate history and vcp
>
> has troubles handling that.
>
>
>
> Is there a way to simply replace integrate/branch by edit/add ? I don't
>
> really need the branching information. A special setting in the config.vcp
>
> file or modifying the code.
>
>
>
> Here's what I'm getting from vcp.log :
>
>
>
> vcp: no DB_File entry for
> SOURCE;//kingkong-xenon-playground/KK-JadePerforce/jade/Main/WinEditors/Sources/DATaControl/DATCCompression.h#3
>
> at VCP/RevMapDB.pm line 58
>
> VCP::RevMapDB::get('VCP::RevMapDB=HASH(0x8608cc8)',
> 'ARRAY(0x8930a94)') called at VCP/Dest/p4.pm line 647
>
>
> VCP::Dest::p4::_integrate_pending_revs('VCP::Dest::p4=HASH(0x87cbe98)')
> called at VCP/Dest/p4.pm line 927
>
> VCP::Dest::p4::submit('VCP::Dest::p4=HASH(0x87cbe98)') called
> at VCP/Dest/p4.pm line 407
>
> VCP::Dest::p4::handle_rev('VCP::Dest::p4=HASH(0x87cbe98)',
> 'VCP::Rev=HASH(0x8930830)') called at
> VCP::Filter::stringedit::stringedit_function line 33
>
>
> VCP::Filter::stringedit::__ANON__('VCP::Filter::stringedit=HASH(0x860e6b0)',
> 'VCP::Rev=HASH(0x8930830)') called at VCP/Filter/stringedit.pm line 356
>
>
> VCP::Filter::stringedit::handle_rev('VCP::Filter::stringedit=HASH(0x860e6b0)',
> 'VCP::Rev=HASH(0x8930830)') called at VCP/Filter/changesets.pm line 882
>
>
> VCP::Filter::changesets::sort_by_change_id_and_send('VCP::Filter::changesets=HASH(0x860e56c)')
> called at VCP/Filter/changesets.pm line 902
>
>
> VCP::Filter::changesets::handle_footer('VCP::Filter::changesets=HASH(0x860e56c)',
> 'HASH(0x860ec44)') called at VCP/Source.pm line 584
>
> VCP::Source::handle_footer('VCP::Source::p4=HASH(0x87e1d88)',
> 'HASH(0x860ec44)') called at VCP.pm line 141
>
> eval {...} called at VCP.pm line 138
>
> VCP::copy_all('VCP=HASH(0x87b2ab4)', 'HASH(0x860e830)',
> 'HASH(0x860ec44)') called at script/vcp_par line 586
>
> eval {...} called at script/vcp_par line 591
>
> require main called at ../blib/lib/PAR.pm line 259
>
>
> PAR::_run_member('Archive::Zip::ZipFileMember=HASH(0x85ea53c)', 1)
> called at script/main.pl line 4
>
> require main called at ../blib/lib/PAR.pm line 259
>
>
> PAR::_run_member('Archive::Zip::ZipFileMember=HASH(0x85ea3ec)') called
> at ../blib/lib/PAR.pm line 225
>
> PAR::import('PAR') called at -e line 765
>
> eval {...} called at -e line 164
>
> __par_pl::BEGIN() called at script/vcp_par line 0
>
> eval {...} called at script/vcp_par line 0
>
>
>
> Thank you,
>
>
>
> Nicolas.
>
>
>
>
>
>------------------------------------------------------------------------
>
>_______________________________________________
>revml mailing list
>[email protected]
>http://maillist.perforce.com/mailman/listinfo/revml
>
>
--------------000505070405030002050502
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: 7bit
<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
<html>
<head>
<meta content="text/html;charset=ISO-8859-1" http-equiv="Content-Type">
</head>
<body bgcolor="#ffffff" text="#000000">
I think you'd have to write a VCP filter module to do that because the
source repository would still need to play back the integrations while
the destination would need to be told to do an add for branch creation
or an edit for a merge-in operation.<br>
<br>
I take it this is the VCP executable from the public depot? We've made
some improvements to the handling of branching and merging since then,
can you post VCP's banner line and a detailed <tt>p4 filelog</tt> for<br>
<br>
<font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA">//kingkong-xenon-playground/KK-JadePerforce/jade/Main/WinEditors/Sources/DATaControl/DATCCompression.h</span></font><br>
<br>
including integration records so I can add a similar scenario to VCP's
test suite?<br>
<br>
Thanks,<br>
<br>
Barrie<br>
<br>
Nicolas Beaufils wrote:
<blockquote
cite="[email protected]"
type="cite">
<meta http-equiv="Content-Type" content="text/html; ">
<meta name="Generator" content="Microsoft Word 11 (filtered medium)">
<style>
<!--
/* Style Definitions */
p.MsoNormal, li.MsoNormal, div.MsoNormal
{margin:0cm;
margin-bottom:.0001pt;
font-size:12.0pt;
font-family:"Times New Roman";}
a:link, span.MsoHyperlink
{color:blue;
text-decoration:underline;}
a:visited, span.MsoHyperlinkFollowed
{color:purple;
text-decoration:underline;}
span.EmailStyle17
{mso-style-type:personal-compose;
font-family:Arial;
color:windowtext;}
@page Section1
{size:612.0pt 792.0pt;
margin:72.0pt 90.0pt 72.0pt 90.0pt;}
div.Section1
{page:Section1;}
-->
</style>
<div class="Section1">
<p class="MsoNormal"><font face="Arial" size="2"><span
style="font-size: 10pt; font-family: Arial;" lang="EN-CA">Hello,<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="2"><span
style="font-size: 10pt; font-family: Arial;" lang="EN-CA"><o:p> </o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="2"><span
style="font-size: 10pt; font-family: Arial;" lang="EN-CA">I’m trying
to use VCP to move a depot from one
instance of PERFORCE<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="2"><span
style="font-size: 10pt; font-family: Arial;" lang="EN-CA">to another.
The source depot has some branch/integrate
history and vcp<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="2"><span
style="font-size: 10pt; font-family: Arial;" lang="EN-CA">has troubles
handling that.<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="2"><span
style="font-size: 10pt; font-family: Arial;" lang="EN-CA"><o:p> </o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="2"><span
style="font-size: 10pt; font-family: Arial;" lang="EN-CA">Is there a
way to simply replace integrate/branch by
edit/add ? I don’t <o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="2"><span
style="font-size: 10pt; font-family: Arial;" lang="EN-CA">really need
the branching information. A special
setting in the config.vcp<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="2"><span
style="font-size: 10pt; font-family: Arial;" lang="EN-CA">file or
modifying the code.<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="2"><span
style="font-size: 10pt; font-family: Arial;" lang="EN-CA"><o:p> </o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="2"><span
style="font-size: 10pt; font-family: Arial;" lang="EN-CA">Here’s what
I’m getting from vcp.log :<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="2"><span
style="font-size: 10pt; font-family: Arial;" lang="EN-CA"><o:p> </o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA">vcp: no
DB_File entry for
SOURCE;//kingkong-xenon-playground/KK-JadePerforce/jade/Main/WinEditors/Sources/DATaControl/DATCCompression.h#3<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA"> at
VCP/RevMapDB.pm line 58<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA">
VCP::RevMapDB::get('VCP::RevMapDB=HASH(0x8608cc8)', 'ARRAY(0x8930a94)')
called
at VCP/Dest/p4.pm line 647<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA">
VCP::Dest::p4::_integrate_pending_revs('VCP::Dest::p4=HASH(0x87cbe98)')
called
at VCP/Dest/p4.pm line 927<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA">
VCP::Dest::p4::submit('VCP::Dest::p4=HASH(0x87cbe98)') called at
VCP/Dest/p4.pm
line 407<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA">
VCP::Dest::p4::handle_rev('VCP::Dest::p4=HASH(0x87cbe98)',
'VCP::Rev=HASH(0x8930830)') called at
VCP::Filter::stringedit::stringedit_function line 33<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA">
VCP::Filter::stringedit::__ANON__('VCP::Filter::stringedit=HASH(0x860e6b0)',
'VCP::Rev=HASH(0x8930830)') called at VCP/Filter/stringedit.pm line 356<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA">
VCP::Filter::stringedit::handle_rev('VCP::Filter::stringedit=HASH(0x860e6b0)',
'VCP::Rev=HASH(0x8930830)') called at VCP/Filter/changesets.pm line 882<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA">
VCP::Filter::changesets::sort_by_change_id_and_send('VCP::Filter::changesets=HASH(0x860e56c)')
called at VCP/Filter/changesets.pm line 902<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA">
VCP::Filter::changesets::handle_footer('VCP::Filter::changesets=HASH(0x860e56c)',
'HASH(0x860ec44)') called at VCP/Source.pm line 584<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA">
VCP::Source::handle_footer('VCP::Source::p4=HASH(0x87e1d88)',
'HASH(0x860ec44)') called at VCP.pm line 141<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA"> eval
{...}
called at VCP.pm line 138<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA">
VCP::copy_all('VCP=HASH(0x87b2ab4)', 'HASH(0x860e830)',
'HASH(0x860ec44)')
called at script/vcp_par line 586<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA"> eval
{...}
called at script/vcp_par line 591<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA">
require
main called at ../blib/lib/PAR.pm line 259<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA">
PAR::_run_member('Archive::Zip::ZipFileMember=HASH(0x85ea53c)', 1)
called at
script/main.pl line 4<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA">
require
main called at ../blib/lib/PAR.pm line 259<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA">
PAR::_run_member('Archive::Zip::ZipFileMember=HASH(0x85ea3ec)') called
at
../blib/lib/PAR.pm line 225<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA">
PAR::import('PAR') called at -e line 765<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA"> eval
{...}
called at -e line 164<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA">
__par_pl::BEGIN() called at script/vcp_par line 0<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="1"><span
style="font-size: 8pt; font-family: Arial;" lang="EN-CA"> eval
{...}
called at script/vcp_par line 0<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="2"><span
style="font-size: 10pt; font-family: Arial;" lang="EN-CA"><o:p> </o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="2"><span
style="font-size: 10pt; font-family: Arial;" lang="EN-CA">Thank you,<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="2"><span
style="font-size: 10pt; font-family: Arial;" lang="EN-CA"><o:p> </o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="2"><span
style="font-size: 10pt; font-family: Arial;" lang="EN-CA">Nicolas.<o:p></o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="2"><span
style="font-size: 10pt; font-family: Arial;" lang="EN-CA"><o:p> </o:p></span></font></p>
<p class="MsoNormal"><font face="Arial" size="2"><span
style="font-size: 10pt; font-family: Arial;" lang="EN-CA"><o:p> </o:p></span></font></p>
</div>
<pre wrap="">
<hr size="4" width="90%">
_______________________________________________
revml mailing list
<a class="moz-txt-link-abbreviated" href="mailto:[email protected]">[email protected]</a>
<a class="moz-txt-link-freetext" href="http://maillist.perforce.com/mailman/listinfo/revml">http://maillist.perforce.com/mailman/listinfo/revml</a>
</pre>
</blockquote>
<br>
</body>
</html>
--------------000505070405030002050502--
--===============1512609055==
Content-Type: text/plain; charset="us-ascii"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
_______________________________________________
revml mailing list
[email protected]
http://maillist.perforce.com/mailman/listinfo/revml
--===============1512609055==--