# | Change | User | Description | Committed | |
---|---|---|---|---|---|
#1 | 26953 | Paul Allen | Move //guest/perforce_software/p4convert to //guest/perforce_software/p4convert/main | ||
//guest/perforce_software/p4convert/src/test/java/com/perforce/cvs/integration/import/base/rev2.0/jnl.sort | |||||
#1 | 14805 | Paul Allen |
Fix for missing 2.0 revision labels. - Test case 067 and minor update to Simlink test #review-14790 @russell_jackson ISSUE: The RCS only has a 1.1 branched to 2.0 and labels are missing on 2.0? http://users.csc.calpoly.edu/~jdalbey/205/Resources/cvsBranchMerge.html +---------+ Release-1 -> __! 1.2.2.1 !____ <- the maintenance branch / +---------+ \ / \ / \ +-----+/ +-----+ +-----+ \+-----+ ! 1.0 !---! 1.1 !----! 1.2 !----! 2.0 ! <- The main trunk +-----+ +-----+ +-----+ +-----+ |