I'm working on a script to wrap cvs update to make the output more readable for my users. I'm having trouble parsing the differences in output. My script can handle the first 3 cases fine.
Issues come in when the users try to merge in code from a branch. Case 4 doesn't display a line beginning with 'M|P|U|C' at all. Case 5 displays it early. I can compensate for Case 5, but I'm not sure how to compensate for Case 4. Any thoughts? Any chance this could be changed? Case 1: cvs update on a file I've modified, no repository changes M subdir/file1 Case 2: cvs update on a file I've not modified, repository changes U subdir/file2 Case 3: cvs update on a file I've modified RCS file: /projects/oss/cvsroot/module/subdir/file3,v retrieving revision 1.2 retrieving revision 1.3 Merging differences between 1.2 and 1.3 into file3 M subdir/file3 Case 4: cvs update -j $BRANCH on a file changed on branch, but not locally RCS file: /projects/oss/cvsroot/module/subdir/file4,v retrieving revision 1.27 retrieving revision 1.27.2.1 Merging differences between 1.27 and 1.27.2.1 into file4 Case 5: cvs update -j $BRANCH on a file changed on branch and locally M subdir/file5 RCS file: /projects/oss/cvsroot/module/subdir/file5,v retrieving revision 1.15 retrieving revision 1.15.2.2 Merging differences between 1.15 and 1.15.2.2 into file5 _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://mail.gnu.org/mailman/listinfo/info-cvs