Conference smurf::buildhelp

1472.0. "ATM shared sandbox submit problem" by AOSG::FILTER (Automatic Posting Software - mail to flume::puck) Thu May 18 1995 12:18

Date Of Receipt: 	18-MAY-1995 11:14:23.90
From: 	SMURF::FLUME::jmf "Joshua M. Friedman OSF/UNIX SDE  18-May-1995 1112"
To: 	ftw@DEC:.zko.flume
CC: 	odehelp@DEC:.zko.flume, schulter@DEC:.zko.flume
Subj: 	ATM shared sandbox submit problem

Farrell, sorry for the delay getting back to you.

From the log, this looks like ODE's caught what it thinks are merge
markers (<<<<<<, ======, and/or >>>>>>) after a bmerge done as part
of a bsubmit.  If this were the case, then the 'edit' option could
be selected, the offending lines cleaned up, then 'ok' selected.

Alternatively, you could do an appropriate "bmerge -rATM file" outside
of a bsubmit, which would align the revision in your .BCSconfig file
with the latest submit revision, then no bmerge would be called during
the bsubmit.

From what you can tell about the file, do you expect that a merge
would/should be needed?  Are there lines in the file that ODE is
mistaking for merge markers?  Or is ODE just "confused"?

thanks...	-josh

------- Forwarded Message

To: [email protected]
Cc: [email protected]
Subject: please respond
Reply-To: [email protected]
Date: Tue, 16 May 95 14:45:50 -0400
From: Farrell Woods <[email protected]>
X-Mts: smtp

I'm still having trouble submitting to the ATM shared snadbox.  I *will*
need help with this:
1.206 marvin:ftw> bsubmit -auto -resub 11:34 -date 5/15/95 
The following file(s) will require user interaction during the merge step:
  ./kernel/io/atm/drivers/otto/if_otto.c

Please make a choice from the following list of options:
merge    - Submit all files at this time;
           you will perform required merges now.
no_merge - Submit only files that do not require merging;
           skip all other files.
exit     - Exit bsubmit now, terminating the submission.

Your choice (merge, no_merge, exit): [merge] 
co error: revision 1.1.9 absent
>> FATAL ERROR in /usr/sde/tools/alpha_osf1/bin/ode/bsubmit:
>> co command failed
>> FATAL ERROR in /usr/sde/tools/alpha_osf1/bin/ode/bsubmit:
>> Failed to check out 1.1.9.9
>> WARNING in /usr/sde/tools/alpha_osf1/bin/ode/bsubmit:
>> fopen /x3/sandboxes/newatm/tmp/if_otto.c for reading, failed inside sci_check_for_merge_markers().
>> WARNING in /usr/sde/tools/alpha_osf1/bin/ode/bsubmit:
>> sci_check_for_merge_markers failed on file './kernel/io/atm/drivers/otto/if_otto.c'.

Choose next merge action on ./kernel/io/atm/drivers/otto/if_otto.c
Abort, ok, edit, merge, [r]co, [r]diff  [merge]  abort

*** RE-SUBMISSION REQUIRED ***

- - Source control information is in an intermediate state.
- - Re-submit using -resub 11:34 [ -date 5/15/95 ]


	-- Farrell


------- End of Forwarded Message

Date Of Receipt: 	18-MAY-1995 11:29:00.49
From: 	SMURF::FLUME::jmf "Joshua M. Friedman OSF/UNIX SDE  18-May-1995 1127"
To: 	[email protected]
CC: 	odehelp@DEC:.zko.flume, [email protected]
Subj: 	re: ATM shared sandbox submit problem

Farrell,

I just logged into marvin and looking in /x3/sandboxes/newatm/src
it looks like you got your submit resolved.

What happened?	-josh