| 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: 26-JUN-1996 15:43:48.50 From: FLUME::jmf "Joshua M. Friedman OSF/UNIX SDE" To: odehelp tpb CC: tea vandyck Subj: Re: problem with save_ancestor_info in rc_files after upgrade The setting of save_ancestor_info determines if bmerge saves the ancestry information as check-in comments. The default for this was TRUE, and we had set it to FALSE when it was discovered a year ago or so that the delimiters it used conflicted with Pascal comments (when someone did a merge on a Pascal file and then couldn't compile). This problem was fixed in ODE V3.1, and so I took out the FALSE setting in the global.rc_files file which it was set. In PTA Grant had decided to turn this on, and used the only syntax ode provides for this, which is "replace ...", but when I removed the 1st setting in the global file, this replace was no longer able to function without an initial setting. I see that Grant commented out the line in ptaos's rc_files, however I just also added back this line in the global file: # Turn on auto merge comments save_ancestor_info TRUE -josh
| T.R | Title | User | Personal Name | Date | Lines |
|---|---|---|---|---|---|
| 2370.1 | Re: problem with save_ancestor_info in rc_files after upgrade | AOSG::FILTER | Automatic Posting Software - mail to flume::puck | Wed Jun 26 1996 17:26 | 34 |
Date Of Receipt: 26-JUN-1996 15:53:49.19 From: FLUME::tpb "Thomas Prescott Blinn USG 26-Jun-1996 1553" To: Joshua M. Friedman OSF/UNIX SDE <jmf@DEC:.zko.flume> CC: odehelp@DEC:.zko.flume, tea@DEC:.zko.flume, vandyck@DEC:.zko.flume Subj: Re: problem with save_ancestor_info in rc_files after upgrade > The setting of save_ancestor_info determines if bmerge saves the > ancestry information as check-in comments. The default for this was > TRUE, and we had set it to FALSE when it was discovered a year ago or > so that the delimiters it used conflicted with Pascal comments (when > someone did a merge on a Pascal file and then couldn't compile). This > problem was fixed in ODE V3.1, and so I took out the FALSE setting in > the global.rc_files file which it was set. > > In PTA Grant had decided to turn this on, and used the only syntax ode > provides for this, which is "replace ...", but when I removed the 1st > setting in the global file, this replace was no longer able to function > without an initial setting. > > I see that Grant commented out the line in ptaos's rc_files, however I > just also added back this line in the global file: > # Turn on auto merge comments > save_ancestor_info TRUE > -josh Thanks for the explanation; I was looking at odeman bmerge just a few moments ago and was reminded that that's what it's for. I didn't know the history about the Pascal problems. By adding a setting to my sandbox's own ./shared file I worked around it. Tom | |||||