| Title: | USG buildhelp questions/answers |
| Moderator: | SMURF::FILTER |
| Created: | Mon Apr 26 1993 |
| Last Modified: | Mon Jan 20 1997 |
| Last Successful Update: | Fri Jun 06 1997 |
| Number of topics: | 2763 |
| Total number of notes: | 5802 |
Date Of Receipt: 23-AUG-1993 12:08:49.90 From: FLAMBE::jmf "Joshua M. Friedman ULTRIX SDE 23-Aug-1993 1208" To: brett@DEC:.zko.flambe CC: jtkohl@DEC:.zko.flambe, jon@DEC:.zko.flambe, odehelp@DEC:.zko.flambe Subj: re: ode magic needed for .mrg..files.dat Brett/John, Jon Wallace and I took care of this file on Friday, changing it from a "BIN" binary file (in ODE's eyes) to a normal file with "# " comment headers. It will now merge normally. We will be looking into whether other .mrg files should also have this change submitted for them. -josh ------- Forwarded Message Return-Path: brett Delivery-Date: Mon, 23 Aug 93 09:26:56 +28716 Return-Path: brett Received: by flambe.zk3.dec.com; id AA05243; Mon, 23 Aug 1993 09:26:55 -0400 Received: by quarry.zk3.dec.com; id AA01348; Mon, 23 Aug 1993 09:26:55 -0400 Received: by buddha.zk3.dec.com; id AA29689; Mon, 23 Aug 1993 09:26:59 -0400 Message-Id: <[email protected]> To: jmf Cc: jon Subject: ode magic needed, Date: Mon, 23 Aug 93 09:26:59 -0400 From: ""(Earl Brett Sampson, Sterling Tech. Leader)" <brett>" <brett> X-Mts: smtp - ------- Forwarded Message Return-Path: [email protected] Received: by minsrv.zk3.dec.com (5.65/DEC-USSG-ZK3-ULTRIX-09/27/91); id AA09076; Fri, 20 Aug 1993 13:56:24 -0400 Received: by abyss.zk3.dec.com (5.65/DEC-USSG-ZK3-ULTRIX-09/27/91); id AA26962; Fri, 20 Aug 1993 13:56:12 -0400 Received: by mountain.zk3.dec.com; id AA21597; Fri, 20 Aug 1993 13:56:11 -0400 Date: Fri, 20 Aug 1993 13:56:11 -0400 From: John T Kohl <[email protected]> Message-Id: <[email protected]> To: [email protected], [email protected], [email protected] In-Reply-To: kenny's message of Fri, 20 Aug 93 13:38:54 -0400, <[email protected]> Subject: Re: Updated BL5 SS List. X-Us-Snail: DEC, 110 Spit Brook Road, M/S ZKO3-3/U14, Nashua, NH 03062 Hmm, this was the first I heard of the cdfs problem. Looking at the blog for .mrg..files.dat, my addition of cdfs_data.c got nuked by Uttam's submission of the new DLI code. This is likely because (last I looked) ODE thought .mrg..files.dat was a binary file, and wouldn't let you bdiff & bmerge it. Since this file is really a text file, can someone sprinkle magic ODE powder over it so that it can be bdiff'ed and bmerge'd like other text files? Who's the right person to cast that ODE spell? John - ------- End of Forwarded Message ------- End of Forwarded Message
| T.R | Title | User | Personal Name | Date | Lines |
|---|---|---|---|---|---|
| 285.1 | Re: ode magic needed for .mrg..files.dat | SMURF::FILTER | Automatic Posting Software - mail to flume::puck | Mon Aug 23 1993 16:39 | 78 |
Date Of Receipt: 23-AUG-1993 15:17:08.75 From: QUARRY::brett "Brett Sampson USG 23-Aug-1993 1516" To: "Joshua M. Friedman, OSF/UNIX SDE 381-1548" <jmf@DEC:.zko.quarry> CC: brett@DEC:.zko.quarry, jtkohl@DEC:.zko.quarry, jon@DEC:.zko.quarry, odehelp@DEC:.zko.quarry Subj: Re: ode magic needed for .mrg..files.dat thank-you > Brett/John, Jon Wallace and I took care of this file on Friday, changing > it from a "BIN" binary file (in ODE's eyes) to a normal file with "# " > comment headers. It will now merge normally. > > We will be looking into whether other .mrg files should also have this > change submitted for them. > > -josh > > ------- Forwarded Message > > Return-Path: brett > Delivery-Date: Mon, 23 Aug 93 09:26:56 +28716 > Return-Path: brett > Received: by flambe.zk3.dec.com; id AA05243; Mon, 23 Aug 1993 09:26:55 -0400 > Received: by quarry.zk3.dec.com; id AA01348; Mon, 23 Aug 1993 09:26:55 -0400 > Received: by buddha.zk3.dec.com; id AA29689; Mon, 23 Aug 1993 09:26:59 -0400 > Message-Id: <[email protected]> > To: jmf > Cc: jon > Subject: ode magic needed, > Date: Mon, 23 Aug 93 09:26:59 -0400 > From: ""(Earl Brett Sampson, Sterling Tech. Leader)" <brett>" <brett> > X-Mts: smtp > > > - ------- Forwarded Message > > Return-Path: [email protected] > Received: by minsrv.zk3.dec.com (5.65/DEC-USSG-ZK3-ULTRIX-09/27/91); > id AA09076; Fri, 20 Aug 1993 13:56:24 -0400 > Received: by abyss.zk3.dec.com (5.65/DEC-USSG-ZK3-ULTRIX-09/27/91); > id AA26962; Fri, 20 Aug 1993 13:56:12 -0400 > Received: by mountain.zk3.dec.com; id AA21597; Fri, 20 Aug 1993 13:56:11 -040 0 > Date: Fri, 20 Aug 1993 13:56:11 -0400 > From: John T Kohl <[email protected]> > Message-Id: <[email protected]> > To: [email protected], [email protected], [email protected] > In-Reply-To: kenny's message of Fri, 20 Aug 93 13:38:54 -0400, > <[email protected]> > Subject: Re: Updated BL5 SS List. > X-Us-Snail: DEC, 110 Spit Brook Road, M/S ZKO3-3/U14, Nashua, NH 03062 > > Hmm, this was the first I heard of the cdfs problem. > > Looking at the blog for .mrg..files.dat, my addition of cdfs_data.c > got nuked by Uttam's submission of the new DLI code. > > This is likely because (last I looked) ODE thought .mrg..files.dat was a > binary file, and wouldn't let you bdiff & bmerge it. > > Since this file is really a text file, can someone sprinkle magic ODE > powder over it so that it can be bdiff'ed and bmerge'd like other text > files? Who's the right person to cast that ODE spell? > > John > > - ------- End of Forwarded Message > > > ------- End of Forwarded Message > --------- Brett Sampson [email protected] Digital Equipment Corporation USG/Unix Engineering MS ZK3-3/Y25 Nashua, NH tx: 603/881-2967 (DTN 381-2967) | |||||