Conference smurf::buildhelp

1697.0. "Re: bmerge problem" by AOSG::FILTER (Automatic Posting Software - mail to flume::puck) Wed Aug 16 1995 16:17

Date Of Receipt: 	15-AUG-1995 12:35:16.39
From: 	SMURF::QUARRY::"vandyck@cardinal.zk3.dec.com" "15-Aug-1995 1234"
To: 	dirce@zk3.dec.com
CC: 	odehelp@zk3.dec.com
Subj: 	Re: bmerge problem

There's a new visual option to bmerge "bmerge -visual" that will show you all 
of both files that are being merged.

Did you change sandboxes or backingtrees from the other time it worked, or did 
the version you are backed against change since the other day (ie. the tree 
got updated)?

		-Grant


| 
| I had done a similar bmerge few days ago, and the resulting
| in_var.h was good. Since yesterday, after the bmerge, which
| succeeds, the new in_var.h is missing the structure 'router_info'.
| I tried 3 times... Unless I am doing something wrong...
| 
| Thanks,
| 
| 	Dirce
| 
| ------- Forwarded Message
| 
| Return-Path: dirce
| Received: from fast1.zk3.dec.com by alpha.zk3.dec.com; (5.65v3.0/1.1.8.2/20Ma
y95-1022AM)
| 	id AA19830; Tue, 15 Aug 1995 12:04:41 -0400
| From: Dirce Richards bos <dirce>
| Received: by fast1.zk3.dec.com; (5.65v3.1/1.1.10.2/21Apr95-0504PM)
| 	id AA20010; Tue, 15 Aug 1995 12:04:41 -0400
| Date: Tue, 15 Aug 1995 12:04:41 -0400
| Message-Id: <9508151604.AA20010@fast1.zk3.dec.com>
| Apparently-To: dirce
| 
| Script started on Tue Aug 15 12:02:56 1995
| fast1<1> bmerge -ode_debug -cv -j4.2.14.2:4.2.18.1 in_var.h
| >> FATAL ERROR in bmerge:
|    No such option: -ode_debug.
| USAGE:
| bmerge [file opts] [merge opts] [ ODE opts ] <files>
| 	file options:
| 	  -changed -saved -all
| 	merge options:
| 	  -r <revision>
| 	  -j<ancestor_rev>:<merge_rev> <files>
| 	  -km 
| 	ODE options:
| 	  -debug -quiet -verbose -normal
| 	  -rc <user rc> -sb <sandbox> -set <set> -sb_rc <sandbox rc>
| bmerge -version | -usage 
| fast1<2> bmerge -debug  -cv -j4.2.14.2:4.2.18.1 in_var.h
| >  Reading rc file : /usr/users/dirce/.sandboxrc
| >> FATAL ERROR in bmerge:
|    No such option: -cv.
| USAGE:
| bmerge [file opts] [merge opts] [ ODE opts ] <files>
| 	file options:
| 	  -changed -saved -all
| 	merge options:
| 	  -r <revision>
| 	  -j<ancestor_rev>:<merge_rev> <files>
| 	  -km 
| 	ODE options:
| 	  -debug -quiet -verbose -normal
| 	  -rc <user rc> -sb <sandbox> -set <set> -sb_rc <sandbox rc>
| bmerge -version | -usage 
| fast1<3> bmerge -j4.2.14.2:4.2.18.1 in_var.h
| >> FATAL ERROR in bmerge:
| >> The file ./kernel/netinet/in_var.h is already writeable; merge step aborte
d
| fast1<4> bcs -u in_var.h
| 
| [ ./kernel/netinet/in_var.h ]
| [ working file set read-only ]
| fast1<5> bmerge -j4.2.14.2:4.2.18.1 in_var.h
| The following files(s) will require user interaction during the merge step:
|  ./kernel/netinet/in_var.h
| Warning: 1 overlaps during merge of ./kernel/netinet/in_var.h.
| 
| './kernel/netinet/in_var.h' NOT merged - choose a merge option from the follo
wing list:
| 
| visual   -  Re-do the merge in visual mode on DISPLAY fast1.zk3.dec.com:0.
|             Only select this option if fast1.zk3.dec.com:0 is a valid value f
or DISPLAY.
|             The visual option will be in effect for this file only.
| 
| novisual    -  Re-do the merge in non-visual mode.
| 
| rco      -  Ignore the result of the previous merge action.
|             Take the latest copy, found on the current private
|             branch,'Dirce_Richards_ifaccess3'. Your work will overwrite
|             the specified version '4.2.18.1'.
| 
| co       -  Ignore the result of the previous merge action.
|             Put back the specified version '4.2.18.1' as is, in the 
|             resulting file.
| 
| Choose next merge action on ./kernel/netinet/in_var.h
| Abort, ok, edit, novisual, visual, [r]co, help  [edit]  
| [?25h[?1h"/usr/users/dirce/newsb/ifaccess3/tmp/in_var.h" 335 lines, 
107
12 characters /*
| * @DEC_COPYRIGHT@
|  */
| /*
| * HISTORY
|  * $Log: in_var.h,v $
|  * Revision 4.2.18.2  1995/08/15  16:00:08  Dirce_Richards
|  *	cleanup
|  *
| * Revision 4.2.18.1  1995/08/15  15:59:21  Dirce_Richards
|  * *** Initial Branch Revision ***
|  *
| * Revision 4.2.16.2  1995/08/07  19:33:14  Dirce_Richards
|  *	Introduce access filter (provided by Fred Templin)
|  *
| * Revision 4.2.14.2  1995/06/15  20:29:13  Ajay_Kachrani
|  *	bmerged
|  *	[1995/06/13  20:55:34  Ajay_Kachrani]
|  *
| *	Added 3.5 IP Multicast support including new router_info struct
|  *	and two new members in in_multi struct.
|  *	[1995/05/18  19:27:24  Ajay_Kachrani]
|  *"/usr/users/dirce/newsb/ifaccess3/tmp/in_var.h" 335 lines, 10712 
char
acters/>>>
 *
| * $EndLog$
|  */
| /*
| <<<<<<< 4.2.18.1
|  *	@(#)$RCSfile: in_var.h,v $ $Revision: 4.2.18.1 $ (DEC) $Date: 1995/08/1
5 15:59:2
| 1 $
| =======
|  *	@(#)$RCSfile: in_var.h,v $ $Revision: 4.2.18.2 $ (DEC) $Date: 1995/08/1
5 16:00:0
| 8 $
| >>>>>>> 4.2.18.2 : Dirce_Richards_ifaccess3
|  */
| /*
| */
| /*
| * (c) Copyright 1990, OPEN SOFTWARE FOUNDATION, INC.
|  * ALL RIGHTS RESERVED
|  */
| /*
| * OSF/1 Release 1.0
|  */
| /*
| * Copyright (c) 1985, 1986 Regents of the University of 
California.
[2A7
| 8 * All rights reserved.7
| 
| 8 *
| * Redistribution and use in source and binary forms are permitted 
provided[5;1
H7
| 8 * that: (1) source distributions retain this entire copyright 
not
ice and
| 
| 7
| 8 * comment, and (2) distributions including binaries display 
the f
ollowing:wq
"/usr/users/dirce/newsb/ifaccess3/tmp/in_var.h" 331 
lines, 10556 characters 
D[?25h[?1l
| Choose next merge action on ./kernel/netinet/in_var.h
| Abort, ok, edit, novisual, visual, [r]co, help  [rdiff]  ok
| 
| *** Done with merging './kernel/netinet/in_var.h' ***
| fast1<6> diff in_var.h in_var.h.best
| 5a6,7
| >  * $Log: in_var.h,v $
| >  * Revision 4.2.18.3  1995/08/15  14:27:25  Dirce_Richards
| 11,13d12
| <  * $Log: in_var.h,v $
| <  * Revision 4.2.18.2  1995/08/15  16:00:08  Dirce_Richards
| <  * 	cleanup
| 15,17c14,16
| <  * Revision 4.2.18.1  1995/08/15  15:59:21  Dirce_Richards
| <  * *** Initial Branch Revision ***
| <  *
| - ---
| >  * Revision 4.2.18.2  1995/08/15  14:20:33  Dirce_Richards
| >  * 	cleanup
| >  * 
| 24c23
| <  *
| - ---
| >  * 
| 28c27
| <  *
| - ---
| >  * 
| 83c82
| <  *	@(#)$RCSfile: in_var.h,v $ $Revision: 4.2.18.2 $ (DEC) $Date: 1995/08/1
5 16:00:08 $
| - ---
| >  *	@(#)$RCSfile: in_var.h,v $ $Revision: 4.2.18.3 $ (DEC) $Date: 1995/08/1
5 14:27:25 $
| 247a247,259
| > 
| > /*
| >  * Per-interface router version information is kept in this list.
| >  * This information should be part of the ifnet structure but we don't wish
| >  * to change that - as it might break a number of things
| >  */
| > 
| > struct router_info {
| >        struct ifnet *ifp;
| >        int    type; /* type of router which is querier on this interface */
| >        int    time; /* # of slow timeouts since last old query */
| >        struct router_info *next;
| > };
| fast1<7> exit
| fast1<8> 
| script done on Tue Aug 15 12:04:35 1995
| 
| ------- End of Forwarded Message
| 


				-Grant