P4 Dest driver with branch+edit

--RASg3xLB4tUQ4RcS
Content-Type: multipart/mixed; boundary="bg08WKrSYDhXBjb5"
Content-Disposition: inline


--bg08WKrSYDhXBjb5
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline

Attached is a simple test case (revml dumped from p4) where a branch
has a file modified on the branch creation time. VCP fails to load the
revml into another fresh p4 server with the error:

5.808494 vcp: $ p4 -c vcp_tmp_53845 -p localhost:16667 -x - integrate -b vcp_53845
//depot/foo-new/a.txt#1 - branch/sync from //depot/foo-stable/a.txt#1,#2
//depot/foo-new/b.txt#1 - branch/sync from //depot/foo-stable/b.txt#1
6.626987 vcp: $ p4 -c vcp_tmp_53845 -p localhost:16667 -x - edit -t text
//depot/foo-new/b.txt#1 - reopened for add
6.731603 vcp: $ p4 -c vcp_tmp_53845 -p localhost:16667 submit -i
Can't include file(s) not already opened.
Open new files with p4 add, p4 edit, etc.
6.941563 vcp: unexpected stderr from 'p4':
p4: Can't include file(s) not already opened.
p4: Open new files with p4 add, p4 edit, etc.
p4 -c vcp_tmp_53845 -p localhost:16667 submit -i returned 1 not 0
stderr:
    Can't include file(s) not already opened.
    Open new files with p4 add, p4 edit, etc.

Cheers,
CLK

--bg08WKrSYDhXBjb5
Content-Type: text/plain; charset=us-ascii
Content-Disposition: attachment; filename="p4test.revml"

<?xml version="1.0"?>
<revml version="0.35">
   <time>1970-01-01 00:00:42Z</time>
   <rep_type>p4</rep_type>
   <rep_desc>User name: clkao
Client name: vcp_tmp_53694
Client host: portege.clkao.org
Client root: /data/p4co/tmp/vcp53694/source-p4/co
Current directory: /data/p4co/tmp/vcp53694/source-p4/co
Client address: 127.0.0.1:50393
Server address: localhost:16666
Server root: /tmp/p4testroot
Server date: 2004/04/20 15:39:41 +0100 BST
Server version: P4D/FREEBSD4/2003.1/48448 (2003/09/12)
Server license: none
</rep_desc>
   <rev_root>depot</rev_root>
   <rev id="//depot/foo-stable/a.txt#2">
      <name>foo-stable/a.txt</name>
      <source_name>foo-stable/a.txt</source_name>
      <source_filebranch_id>//depot/foo-stable/a.txt</source_filebranch_id>
      <source_repo_id>p4:localhost:16666</source_repo_id>
      <type>text</type>
      <p4_info>... #2 change 3 edit on 2004/04/20 by clkao@claptop (text)
</p4_info>
      <branch_id>//depot/foo-stable/</branch_id>
      <source_branch_id>//depot/foo-stable/</source_branch_id>
      <rev_id>2</rev_id>
      <source_rev_id>2</source_rev_id>
      <change_id>3</change_id>
      <source_change_id>3</source_change_id>
      <time>2004-04-19 23:00:00Z</time>
      <user_id>clkao</user_id>
      <comment>modified on stable
</comment>
      <previous_id>//depot/foo-stable/a.txt#1</previous_id>
      <content encoding="none">fnord
modified on stable
</content>
      <digest type="MD5" encoding="base64">SfsDHXmC1WNVDkNGI3cj8A</digest>
   </rev>
   <rev id="//depot/foo-trunk/b.txt#1">
      <name>foo-trunk/b.txt</name>
      <source_name>foo-trunk/b.txt</source_name>
      <source_filebranch_id>//depot/foo-trunk/b.txt</source_filebranch_id>
      <source_repo_id>p4:localhost:16666</source_repo_id>
      <type>text</type>
      <p4_info>... #1 change 1 add on 2004/04/20 by clkao@claptop (text)
</p4_info>
      <branch_id>//depot/foo-trunk/</branch_id>
      <source_branch_id>//depot/foo-trunk/</source_branch_id>
      <rev_id>1</rev_id>
      <source_rev_id>1</source_rev_id>
      <change_id>1</change_id>
      <source_change_id>1</source_change_id>
      <time>2004-04-19 23:00:00Z</time>
      <user_id>clkao</user_id>
      <comment>first commit.
</comment>
      <content encoding="none">bozo
</content>
      <digest type="MD5" encoding="base64">qMD9lpGNH5v7BQIrL1JIXQ</digest>
   </rev>
   <rev id="//depot/foo-stable/b.txt#1">
      <name>foo-stable/b.txt</name>
      <source_name>foo-stable/b.txt</source_name>
      <source_filebranch_id>//depot/foo-stable/b.txt</source_filebranch_id>
      <source_repo_id>p4:localhost:16666</source_repo_id>
      <branch_id>//depot/foo-stable/</branch_id>
      <source_branch_id>//depot/foo-stable/</source_branch_id>
      <rev_id>1</rev_id>
      <source_rev_id>1</source_rev_id>
      <change_id>2</change_id>
      <source_change_id>2</source_change_id>
      <time>2004-04-19 23:00:00Z</time>
      <user_id>clkao</user_id>
      <comment>branch for foo-stable.
</comment>
      <previous_id>//depot/foo-trunk/b.txt#1</previous_id>
      <placeholder />
   </rev>
   <rev id="//depot/foo-new/a.txt#1">
      <name>foo-new/a.txt</name>
      <source_name>foo-new/a.txt</source_name>
      <source_filebranch_id>//depot/foo-new/a.txt</source_filebranch_id>
      <source_repo_id>p4:localhost:16666</source_repo_id>
      <branch_id>//depot/foo-new/</branch_id>
      <source_branch_id>//depot/foo-new/</source_branch_id>
      <rev_id>1</rev_id>
      <source_rev_id>1</source_rev_id>
      <change_id>4</change_id>
      <source_change_id>4</source_change_id>
      <time>2004-04-19 23:00:00Z</time>
      <user_id>clkao</user_id>
      <comment>branch foo-new and edit b.
</comment>
      <previous_id>//depot/foo-stable/a.txt#2</previous_id>
      <placeholder />
   </rev>
   <rev id="//depot/foo-trunk/a.txt#1">
      <name>foo-trunk/a.txt</name>
      <source_name>foo-trunk/a.txt</source_name>
      <source_filebranch_id>//depot/foo-trunk/a.txt</source_filebranch_id>
      <source_repo_id>p4:localhost:16666</source_repo_id>
      <type>text</type>
      <p4_info>... #1 change 1 add on 2004/04/20 by clkao@claptop (text)
</p4_info>
      <branch_id>//depot/foo-trunk/</branch_id>
      <source_branch_id>//depot/foo-trunk/</source_branch_id>
      <rev_id>1</rev_id>
      <source_rev_id>1</source_rev_id>
      <change_id>1</change_id>
      <source_change_id>1</source_change_id>
      <time>2004-04-19 23:00:00Z</time>
      <user_id>clkao</user_id>
      <comment>first commit.
</comment>
      <content encoding="none">fnord
</content>
      <digest type="MD5" encoding="base64">1YoGBu1haCDeKR1ZRgJmXQ</digest>
   </rev>
   <rev id="//depot/foo-stable/a.txt#1">
      <name>foo-stable/a.txt</name>
      <source_name>foo-stable/a.txt</source_name>
      <source_filebranch_id>//depot/foo-stable/a.txt</source_filebranch_id>
      <source_repo_id>p4:localhost:16666</source_repo_id>
      <branch_id>//depot/foo-stable/</branch_id>
      <source_branch_id>//depot/foo-stable/</source_branch_id>
      <rev_id>1</rev_id>
      <source_rev_id>1</source_rev_id>
      <change_id>2</change_id>
      <source_change_id>2</source_change_id>
      <time>2004-04-19 23:00:00Z</time>
      <user_id>clkao</user_id>
      <comment>branch for foo-stable.
</comment>
      <previous_id>//depot/foo-trunk/a.txt#1</previous_id>
      <placeholder />
   </rev>
   <rev id="//depot/foo-new/b.txt#1">
      <name>foo-new/b.txt</name>
      <source_name>foo-new/b.txt</source_name>
      <source_filebranch_id>//depot/foo-new/b.txt</source_filebranch_id>
      <source_repo_id>p4:localhost:16666</source_repo_id>
      <type>text</type>
      <p4_info>... #1 change 4 add on 2004/04/20 by clkao@claptop (text)
</p4_info>
      <branch_id>//depot/foo-new/</branch_id>
      <source_branch_id>//depot/foo-new/</source_branch_id>
      <rev_id>1</rev_id>
      <source_rev_id>1</source_rev_id>
      <change_id>4</change_id>
      <source_change_id>4</source_change_id>
      <time>2004-04-19 23:00:00Z</time>
      <user_id>clkao</user_id>
      <comment>branch foo-new and edit b.
</comment>
      <previous_id>//depot/foo-stable/b.txt#1</previous_id>
      <delta type="diff-u" encoding="none">@@ -1 +1,2 @@
 bozo
+edit on branching time at foo-new
</delta>
      <digest type="MD5" encoding="base64">UZUIf+bCDAaEujmrY1zSxg</digest>
   </rev>
</revml>

--bg08WKrSYDhXBjb5--

--RASg3xLB4tUQ4RcS
Content-Type: application/pgp-signature
Content-Disposition: inline

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.2.4 (FreeBSD)

iD8DBQFAhTdUk1XldlEkA5YRAkkyAKCIzHi8AJZkJqltHKXZFqLtDrUvHgCdFeq9
p1FCXbeXOsFQk8sIidmEXEc=
=8J8w
-----END PGP SIGNATURE-----

--RASg3xLB4tUQ4RcS--