Change 15579

paul_allen (Paul Allen)
Paul Allen committed this change into //guest/perforce_software/p4convert/src
Request Review
Download .zip
SVN: Fix for 'tampered with after resolve - edit or revert'.

Includes a manufactured test case, seems to be related to an IGNORE resolve with keyword/properties.
  • Files 20
  • Comments 0
4 edited 16 added 0 deleted
main/java/com/perforce/common/asset/TypeMap.java#2
Loading...
main/java/com/perforce/svn/change/ChangeImport.java#2
Loading...
test/java/com/perforce/integration/ImportTests.java#3
Loading...
test/java/com/perforce/integration/IntegrationTests.java#2
Loading...
test/java/com/perforce/integration/dumps/copy-kdate/import/prop/file.txt,d/1.7#1
Loading...
test/java/com/perforce/integration/dumps/copy-kdate/import/trunk/.svn.properties,d/1.5#1
Loading...
test/java/com/perforce/integration/dumps/copy-kdate/import/trunk/.svn.properties,d/1.8#1
Loading...
test/java/com/perforce/integration/dumps/copy-kdate/import/trunk/file.txt,d/1.1#1
Loading...
test/java/com/perforce/integration/dumps/copy-kdate/import/trunk/file.txt,d/1.3#1
Loading...
test/java/com/perforce/integration/dumps/copy-kdate/jnl.0#1
Loading...
test/java/com/perforce/integration/dumps/copy-kdate/repo.dump#1
Loading...
test/java/com/perforce/integration/import/base/copy-kdate/import/copy/file.txt,d/1.4#1
Loading...
test/java/com/perforce/integration/import/base/copy-kdate/import/prop/file.txt,d/1.7#1
Loading...
test/java/com/perforce/integration/import/base/copy-kdate/import/trunk/.svn.properties,d/1.5#1
Loading...
test/java/com/perforce/integration/import/base/copy-kdate/import/trunk/.svn.properties,d/1.8#1
Loading...
test/java/com/perforce/integration/import/base/copy-kdate/import/trunk/file.txt,d/1.1#1
Loading...
test/java/com/perforce/integration/import/base/copy-kdate/import/trunk/file.txt,d/1.3#1
Loading...
test/java/com/perforce/integration/import/base/copy-kdate/import/trunk/file.txt,d/1.5#1
Loading...
test/java/com/perforce/integration/import/base/copy-kdate/import/trunk/file.txt,d/1.8#1
Loading...
test/java/com/perforce/integration/import/base/copy-kdate/jnl.sort#1
Loading...
Tip: Use n and p to cycle through the changes.