Change 11144

paul_allen (Paul Allen)
Paul Allen committed this change into //guest/perforce_software/p4convert
Request Review
Download .zip
CVS: Bug fix for strange case of a (dead) 1.1 revision.

This seems to occur when the source is from another branch.  Not a perfect solution as I change this action to an add, but it allows the conversion to complete and no content is lost.
  • Files 23
  • Comments 0
6 edited 10 added 7 deleted
src/com/perforce/cvs/RcsNavigator.java#11
Loading...
src/com/perforce/cvs/process/CvsProcessNode.java#7
Loading...
test/com/perforce/cvs/integration/import/base/branch-branch/import/main/src/foo,d/1.1#1
Loading...
test/com/perforce/cvs/integration/import/base/branch-branch/import/main/src/foo,d/1.5#2
Loading...
test/com/perforce/cvs/integration/import/base/branch-branch/import/main/src/foo,d/1.6#1
Loading...
test/com/perforce/cvs/integration/import/base/branch-branch/import/rel_3_0/src/foo,d/1.3#2
Loading...
test/com/perforce/cvs/integration/import/base/branch-branch/import/rel_3_0/src/foo,d/1.4#1
Loading...
test/com/perforce/cvs/integration/import/base/branch-branch/jnl.sort#2
Loading...
test/com/perforce/cvs/integration/import/base/branch/import/main/module2/file3.txt,d/1.2#1
Loading...
test/com/perforce/cvs/integration/import/base/branch/import/main/module2/file4.txt,d/1.4#1
Loading...
test/com/perforce/cvs/integration/import/base/branch/import/module_2/module2/file4.txt,d/1.3#2
Loading...
test/com/perforce/cvs/integration/import/base/branch/import/module_2/module2/file4.txt,d/1.4#1
Loading...
test/com/perforce/cvs/integration/import/base/branch/jnl.sort#2
Loading...
test/com/perforce/cvs/integration/integ/base/branch-branch/import/main/src/foo,d/1.5#2
Loading...
test/com/perforce/cvs/integration/integ/base/branch-branch/import/main/src/foo,d/1.6#1
Loading...
test/com/perforce/cvs/integration/integ/base/branch-branch/import/rel_3_0/src/foo,d/1.3#2
Loading...
test/com/perforce/cvs/integration/integ/base/branch-branch/import/rel_3_0/src/foo,d/1.4#1
Loading...
test/com/perforce/cvs/integration/integ/base/branch-branch/jnl.0#2
Loading...
test/com/perforce/cvs/integration/integ/base/branch/import/main/module2/file4.txt,d/1.3#2
Loading...
test/com/perforce/cvs/integration/integ/base/branch/import/main/module2/file4.txt,d/1.4#1
Loading...
test/com/perforce/cvs/integration/integ/base/branch/import/module_2/module2/file4.txt,d/1.3#2
Loading...
test/com/perforce/cvs/integration/integ/base/branch/import/module_2/module2/file4.txt,d/1.4#1
Loading...
test/com/perforce/cvs/integration/integ/base/branch/jnl.0#2
Loading...
Tip: Use n and p to cycle through the changes.