Change 10703

paul_allen (Paul Allen)
Paul Allen committed this change into //guest/perforce_software/p4convert
Request Review
Download .zip
Import Mode: Fix for add + branch in the same change.
Convert Mode: Allow add + branch, but copy +x and other properties to new object.   
 - Added test case 117

----------------------------------------------------------------

Fix for Import mode; when a file is renamed (case only) and contains an edit. 
The branch part of the rename is now downgraded to an EDIT.
 - Added testcase 116
  • Files 20
  • Comments 0
4 edited 16 added 0 deleted
src/com/perforce/svn/change/RevisionImport.java#2
Loading...
src/com/perforce/svn/parser/Content.java#2
Loading...
test/com/perforce/integration/ImportTests.java#4
Loading...
test/com/perforce/integration/IntegrationTests.java#4
Loading...
test/com/perforce/integration/dumps/exe_prop_branch/import/configure.in,d/1.1#1
Loading...
test/com/perforce/integration/dumps/exe_prop_branch/import/install-sh,d/1.1#1
Loading...
test/com/perforce/integration/dumps/exe_prop_branch/jnl.0#1
Loading...
test/com/perforce/integration/dumps/exe_prop_branch/repo.dump#1
Loading...
test/com/perforce/integration/dumps/rename_edit/import/trunk/file.txt,d/1.1#1
Loading...
test/com/perforce/integration/dumps/rename_edit/import/trunk/file.txt,d/1.3#1
Loading...
test/com/perforce/integration/dumps/rename_edit/jnl.0#1
Loading...
test/com/perforce/integration/dumps/rename_edit/repo.dump#1
Loading...
test/com/perforce/integration/import/base/exe_prop_branch/import/branches/6.4.0/configure.in,d/1.1#1
Loading...
test/com/perforce/integration/import/base/exe_prop_branch/import/branches/6.4.0/install-sh,d/1.1#1
Loading...
test/com/perforce/integration/import/base/exe_prop_branch/import/configure.in,d/1.1#1
Loading...
test/com/perforce/integration/import/base/exe_prop_branch/import/install-sh,d/1.1#1
Loading...
test/com/perforce/integration/import/base/exe_prop_branch/jnl.sort#1
Loading...
test/com/perforce/integration/import/base/rename_edit/import/trunk/file.txt,d/1.1#1
Loading...
test/com/perforce/integration/import/base/rename_edit/import/trunk/file.txt,d/1.3#1
Loading...
test/com/perforce/integration/import/base/rename_edit/jnl.sort#1
Loading...
Tip: Use n and p to cycle through the changes.