Conference smurf::buildhelp

2499.0. "Merge/missing rev problem" by AOSG::FILTER (Automatic Posting Software - mail to flume::puck) Fri Aug 23 1996 20:03

Date Of Receipt: 	19-AUG-1996 11:17:25.66
From: 	GURU::yarrusso "Carmen Yarrusso USG"
To: 	odehelp@dec:.zko.guru
CC: 	
Subj: 	Merge/missing rev problem

While trying to bsubmit, I got merge type messages and tried to continue.
After ODE complained about an extra pragma, I deleted the extra and it 
seemed to continue without complaint.

However, days later when I checked for my changes, they were not in the 
code.  However, an entry had been made in the History that reflected my 
attempt--but no code.

I did a bcs -o -u and another bco to start all over.  But now, my latest 
bco not only got rid of the History message, but my revision before this 
that had already been bsubmitted.  I'm confused, help.

The History before and after is given below, note that my last TWO bsubmits 
appear to be gone. ?????

/*
 * @DEC_COPYRIGHT@
 */
/*
 * HISTORY
 * $Log: str_osr.c,v $
 * Revision 4.2.57.3  1996/07/30  14:02:08  Carmen_Yarrusso
 *      ** Merge Information **
 *              ** Command used:        bsubmit **
 *              ** Ancestor revision:   4.2.28.13 **
 *              ** Merge revision:      4.2.57.2 **
 *      ** End **
 *
 * Revision 4.2.57.2  1996/07/01  14:00:48  Carmen_Yarrusso
 *      when a module is pushed the dev value is now passed to its open function
 *      [1996/06/05  19:32:45  Robin_Lewis]
 *
 * Revision 4.2.28.13  1996/02/06  15:38:21  Sandeep_Shah
 *      Adjust the low watermark to match the change in the high watermark
 *      [1996/01/31  17:36:57  Sandeep_Shah]
 *
 * Revision 4.2.28.12  1995/11/06  14:27:04  Robin_Lewis
 *      fix the getmsg function to return 0 len on all calls after a ANGUP as pe
r spec1170
 *      [1995/11/03  20:57:22  Robin_Lewis]
 *
 *      found cnt defined as ulong and the tests for >= 0 which it will always b
e without a sign bit
 *      [1995/11/02  19:59:06  Robin_Lewis]
****************************
****************************
****************************
****************************
/*
 * @DEC_COPYRIGHT@
 */
/*
 * HISTORY
 * $Log: str_osr.c,v $
 * Revision 4.2.28.13  1996/02/06  15:38:21  Sandeep_Shah
 *      Adjust the low watermark to match the change in the high watermark
 *      [1996/01/31  17:36:57  Sandeep_Shah]
 *
 * Revision 4.2.28.12  1995/11/06  14:27:04  Robin_Lewis
 *      fix the getmsg function to return 0 len on all calls after a ANGUP as pe
r spec1170
 *      [1995/11/03  20:57:22  Robin_Lewis]
 *
 *      found cnt defined as ulong and the tests for >= 0 which it will always b
e without a sign bit
 *      [1995/11/02  19:59:06  Robin_Lewis]