Change 11751

paul_allen (Paul Allen)
Paul Allen committed this change into //guest/perforce_software/p4convert
Request Review
Download .zip
SVN: Support branching with multiple sources.

Only applies when SVN_MERGEINFO is enabled.  Import mode requires a resolve step on the branch.

 - Includes test case123 with merge example.
  • Files 14
  • Comments 0
3 edited 11 added 0 deleted
src/com/perforce/svn/change/RevisionImport.java#8
Loading...
test/com/perforce/integration/ImportTests.java#16
Loading...
test/com/perforce/integration/IntegrationTests.java#15
Loading...
test/com/perforce/integration/dumps/branch_multi/import/branches/xxx_14_xxx_br/cpm/parents/cpm-parent/pom.xml,d/1.2#1
Loading...
test/com/perforce/integration/dumps/branch_multi/import/branches/xxx_14_xxxxxxxx_br/cpm/parents/cpm-parent/pom.xml,d/1.5#1
Loading...
test/com/perforce/integration/dumps/branch_multi/import/trunk/cpm/parents/cpm-parent/pom.xml,d/1.3#1
Loading...
test/com/perforce/integration/dumps/branch_multi/import/trunk/cpm/parents/cpm-parent/pom.xml,d/1.4#1
Loading...
test/com/perforce/integration/dumps/branch_multi/jnl.0#1
Loading...
test/com/perforce/integration/dumps/branch_multi/repo.dump#1
Loading...
test/com/perforce/integration/import/base/branch_multi/import/branches/xxx_14_xxx_br/cpm/parents/cpm-parent/pom.xml,d/1.2#1
Loading...
test/com/perforce/integration/import/base/branch_multi/import/branches/xxx_14_xxxxxxxx_br/cpm/parents/cpm-parent/pom.xml,d/1.5#1
Loading...
test/com/perforce/integration/import/base/branch_multi/import/trunk/cpm/parents/cpm-parent/pom.xml,d/1.3#1
Loading...
test/com/perforce/integration/import/base/branch_multi/import/trunk/cpm/parents/cpm-parent/pom.xml,d/1.4#1
Loading...
test/com/perforce/integration/import/base/branch_multi/jnl.sort#1
Loading...
Tip: Use n and p to cycle through the changes.