Are you sure you are doing 'diff' aganist v1.1.1.1? Since you are omitting one of the two versions you are comparing, 'cvs diff' compares with HEAD version (I think). /Peter
<[EMAIL PROTECTED]> wrote in message news:<[EMAIL PROTECTED]>... > I've done this a million times now so this puzzles me. > > I'm trying to merge from branch b dev 01 03 cf into b dev 01 03. > Please explain the following.... > > Using cvs v1.11.17. > > Clearly there is a diff. between the two versions for this particular > file (v1.1.1.1 on b dev 01 03, which is checked out, and v1.1.1.1.6.2 > on b dev 01 03 cf) > > > cvs diff -r1.1.1.1.6.2 ct client.h > Index: ct client.h > ========================= > ========================= > ================= > RCS file: /cvsroot/citt/citt/ct client.h,v > retrieving revision 1.1.1.1.6.2 > diff -r1.1.1.1.6.2 ct client.h > 41c41 > < #define MAXTRANSBUFFER 4096 > --- > > #define MAXTRANSBUFFER 4096*4 > 70a71 > > char ct testerDisplay[32]; > > > > cvs update -j b dev 01 03 -j b dev 01 03 cf ct client.h > M ct client.h > RCS file: /cvsroot/citt/citt/ct client.h,v > retrieving revision 1.1.1.1 > retrieving revision 1.1.1.1.6.2 > Merging differences between 1.1.1.1 and 1.1.1.1.6.2 into ct client.h > ct client.h already contains the differences between 1.1.1.1 and > 1.1.1.1.6.2 > > > -------------------------------------- > Chris T Fouts _______________________________________________ Info-cvs mailing list [EMAIL PROTECTED] http://lists.gnu.org/mailman/listinfo/info-cvs
