Change 10621
Paul Allen
committed this change
into
//guest/perforce_software/p4convert/test/com/perforce/cvs/integration
Request Review
Download .zip
CVS TestCase: merge-copy and merge-edit.
TODO: not active (strange results)
Files
6
Comments
0
2
edited
4
added
0
deleted
•
CvsImportTests.java#13
Loading...
CvsIntegrationTests.java#15
Loading...
dumps/CVScluster01/merge-copy/file1.txt,v#1
Loading...
dumps/CVScluster01/merge-copy/file2.txt,v#1
Loading...
dumps/CVScluster01/merge-edit/file1.txt,v#1
Loading...
dumps/CVScluster01/merge-edit/file2.txt,v#1
Loading...
Tip: Use
n
and
p
to cycle through the changes.