Conference smurf::buildhelp

2597.0. "Problem with a merge (fwd)" by AOSG::FILTER (Automatic Posting Software - mail to flume::puck) Tue Oct 15 1996 21:52

Date Of Receipt: 	 1-OCT-1996 14:38:29.67
From: 	FLUME::mkm "Michael Martin USG"
To: 	odehelp@DEC:.zko.flume
CC: 	mkm@DEC:.zko.flume (Michael Martin USG),
	vandyck@DEC:.zko.flume (Grant Van Dyck USG)
Subj: 	Problem with a merge (fwd)

Josh or Grant,
  I would appreciate it if one of you "ODE masters" could assist on this......Please
drag me in since I want to learn...
thanks,
Mike..

Forwarded message:
> From kenny Tue Oct  1 14:32:46 1996
> Message-Id: <9610011832.AA02868@bwana.zk3.dec.com>
> To: mkm
> Cc: cotter@zk3.dec.com, tgrise, kenny
> Subject: Problem with a merge 
> Date: Tue, 01 Oct 96 14:32:38 -0400
> From: kenny
> X-Mts: smtp
> 
> Mike,
> Can you help Wayne out with this problem please?
> Joe
> 
> ------- Forwarded Message
> 
> Return-Path: rsvp@unx.dec.com 
> Delivery-Date: Tue, 01 Oct 96 13:54:20 -0400
> Return-Path: rsvp@unx.dec.com
> Received: from zeus.unx.dec.com by hunch.zk3.dec.com; 
> (5.65v3.2/1.1.8.2/11Mar96-0342PM)
> 	id AA31005; Tue, 1 Oct 1996 13:54:19 -0400
> Received: from rsvp.unx.dec.com by zeus.unx.dec.com (8.7.5/UNX 
> 1.4/1.1.10.5/28Jun96-0151PM)
> 	id NAA19456; Tue, 1 Oct 1996 13:54:29 -0400 (EDT)
> From: Bob Parlock <rsvp@unx.dec.com>
> Received: by rsvp.unx.dec.com (5.65v3.2/1.1.10.5/14Feb96-0334PM)
> 	id AA10404; Tue, 1 Oct 1996 13:54:16 -0400
> Date: Tue, 1 Oct 1996 13:54:16 -0400
> Message-Id: <9610011754.AA10404@rsvp.unx.dec.com>
> Subject: Problems with ptbcde backing tree
> To: cotter@zk3.dec.com, kenny@zk3.dec.com
> Cc: web@unx.dec.com
> Mime-Version: 1.0
> Content-Type: text/plain; charset=us-ascii
> Content-Transfer-Encoding: 7bit
> Content-Md5: 7ru84VAPNnQQ37awvTZYpw==
> 
> 
> 	Just in case you did not get this mail, Wayne has some
> 	problems/questions. Please work directly with Wayne on
> 	resolving them.
> 	
> 		Thanks,
> 			Bob Parlock
> 
> - ------------- Begin Forwarded Message -------------
> 
> >From web@spiderman.unx.dec.com Tue Oct  1 12:03:34 1996
> Date: Tue, 1 Oct 1996 12:03:34 -0400
> From: "Wayne E. Barlow" <web@spiderman.unx.dec.com>
> To: cotter@hunch.zk0.DEC.D5NET.dec.com, kenny@hunch.zk0.DEC.D5NET.dec.com,
>         rsvp@unx.dec.com, web@spiderman.unx.dec.com
> Subject: Problems with ptbcde backing tree
> Content-Length: 919
> 
> 
> Hi,
> 
> I am in the process of trying to merge the dtterm changes into the ptb pool.
> However, there appears to be a problem with the backing tree.  The linked copy
> of TermParseTable.c is revision 2.1.2.5 dated 1996/02/09.  Both a merge and a
> checkout yield a much older revision 2.1 dated 1994/12/31.  As a result a merge
> is only getting the new changes and all bug fixes from 1994/12/31 up until the
> platinum release are ignored.
> 
> I can simply submit the v40support copy into the ptbcde pool but merge header
> information would be lost.  Please let me know how I should proceed.  In any
> event, I (Wayne_Barlow) will need to be added to the appropriate acl's to make
> this submit.
> 
> Also, I apologize for not getting around to this sooner. Early last week I went
> blindly through the diff procedure forgetting to replace "os" with "cde" so I
> was under the impression no merge was needed.  Sorry about that.
> 
> Regards,
> Wayne.
> 
> - ------------- End Forwarded Message -------------
> 
> 
> 
> ------- End of Forwarded Message
> 
>