| 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: 22-JUL-1993 13:56:43.20
From: LOCORE::stuarth "Stuart Hollander UEG"
To: locore::odehelp
CC:
Subj: help!
What is the bsubmit asking me about?
And, why do the diff and rdiff and edit not do anything?
bsubmit -auto_out -all
Enter the defect number this submission applies to: agosminor-650-stuarth
The following file(s) will require user interaction during the merge step:
'./kernel/conf/alpha/.mrg..files.dat' is a binary file that requires the use of:
co or rco command.
co - check-out ./kernel/conf/alpha/.mrg..files.dat from destination branch alone
- the copy in the submit tree will be kept intact.
rco - check-out ./kernel/conf/alpha/.mrg..files.dat from source configuration alone
- the copy in the submit tree will be overwritten by your copy.
./kernel/conf/alpha/.mrg..files.dat
./kernel/conf/alpha/files
Do you wish to continue ?: [Yes] yes
Abort, ok, edit, merge, [r]co, [r]diff [] rdiff
Abort, ok, edit, merge, [r]co, [r]diff [ok] diff
Abort, ok, edit, merge, [r]co, [r]diff [ok] edit
Abort, ok, edit, merge, [r]co, [r]diff [abort] ok
Abort, ok, edit, merge, [r]co, [r]diff [merge] ok
Abort, ok, edit, merge, [r]co, [r]diff [merge] edit
Abort, ok, edit, merge, [r]co, [r]diff [abort] edit
Abort, ok, edit, merge, [r]co, [r]diff [abort] edit
Abort, ok, edit, merge, [r]co, [r]diff [abort] ok
Abort, ok, edit, merge, [r]co, [r]diff [merge]
| T.R | Title | User | Personal Name | Date | Lines |
|---|---|---|---|---|---|
| 243.1 | bsubmit problem when I needed it the least. | AOSG::TAPPAN | Thu Jul 29 1993 08:46 | 72 | |
<<< SYS$SYSDEVICE:[NOTES$LIBRARY]BUILDHELP.NOTE;1 >>>
-< USG buildhelp questions/answers >-
================================================================================
Note 40.8 Help! bsubmit problem when I needed it the least. 8 of 9
SMURF::FILTER "Automatic Posting Software - mail to" 64 lines 26-JUL-1993 16:07
-< Re: help! >-
--------------------------------------------------------------------------------
Date Of Receipt: 22-JUL-1993 14:01:11.09
From: WASTED::jmf "Joshua M. Friedman ULTRIX SDE"
To: [email protected], [email protected]
CC:
Subj: Re: help!
Stuart, since the .mrg..files.dat file is apparently not a file with an
ode header, it has been identified to the ODE system as a "binary".
ODE now seems to have built-in restrictions that you can't do diffs or
edits on binary files (reasonable for true binary data files, but probably
not so reasonable for text files just tagged as binary).
Please use gen-ptt to report this bug/suggestion. In the meantime,
you should possibly abort, take care of the merge "by hand", bci what
you want to use, and then use the "rco" option during bsubmit.
-josh
From [email protected] Thu Jul 22 13:57:52 1993
Received: by locore.zk3.dec.com (5.65/DEC-USSG-ZK3-ULTRIX-09/27/91);
id AA17778; Thu, 22 Jul 1993 13:56:40 -0400
Date: Thu, 22 Jul 1993 13:56:40 -0400
From: [email protected] (Stuart Hollander UEG)
Message-Id: <[email protected]>
To: [email protected]
Subject: help!
What is the bsubmit asking me about?
And, why do the diff and rdiff and edit not do anything?
bsubmit -auto_out -all
Enter the defect number this submission applies to: agosminor-650-stuarth
The following file(s) will require user interaction during the merge step:
'./kernel/conf/alpha/.mrg..files.dat' is a binary file that requires the use of:
co or rco command.
co - check-out ./kernel/conf/alpha/.mrg..files.dat from destination branch alone
- the copy in the submit tree will be kept intact.
rco - check-out ./kernel/conf/alpha/.mrg..files.dat from source configuration alone
- the copy in the submit tree will be overwritten by your copy.
./kernel/conf/alpha/.mrg..files.dat
./kernel/conf/alpha/files
Do you wish to continue ?: [Yes] yes
Abort, ok, edit, merge, [r]co, [r]diff [] rdiff
Abort, ok, edit, merge, [r]co, [r]diff [ok] diff
Abort, ok, edit, merge, [r]co, [r]diff [ok] edit
Abort, ok, edit, merge, [r]co, [r]diff [abort] ok
Abort, ok, edit, merge, [r]co, [r]diff [merge] ok
Abort, ok, edit, merge, [r]co, [r]diff [merge] edit
Abort, ok, edit, merge, [r]co, [r]diff [abort] edit
Abort, ok, edit, merge, [r]co, [r]diff [abort] edit
Abort, ok, edit, merge, [r]co, [r]diff [abort] ok
Abort, ok, edit, merge, [r]co, [r]diff [merge]
| |||||
| 243.2 | bsubmit problem when I needed it the least | AOSG::TAPPAN | Thu Jul 29 1993 08:47 | 24 | |
<<< SYS$SYSDEVICE:[NOTES$LIBRARY]BUILDHELP.NOTE;1 >>>
-< USG buildhelp questions/answers >-
================================================================================
Note 40.9 Help! bsubmit problem when I needed it the least. 9 of 9
SMURF::FILTER "Automatic Posting Software - mail to" 16 lines 26-JUL-1993 16:08
-< Re: help! >-
--------------------------------------------------------------------------------
Date Of Receipt: 22-JUL-1993 14:03:05.30
From: FLAMBE::johnf "John Flanagan OSG Test Johnf Tools Group 22-Jul-1993 1403"
To: [email protected] (Stuart Hollander UEG)
CC: johnf@DEC:.zko.flambe, odehelp@DEC:.zko.flambe
Subj: Re: help!
The file .mrg..files.dat is a file who's header is set to BIN.
Ode thinks this is a binary file, so it will not let you do the usual
text based operations on it such as rdiff, diff, edit. You essentially
have two choices, co or rco. The co option forces bsubmit to use the current
version in the submit tree. rco will force it to use your version. You want
to choose the rco option here so that your changes will be put into the file.
John
| |||||