Conference smurf::buildhelp

1780.0. "seeking language-neutral comment characters for ODE merge markers" by AOSG::FILTER (Automatic Posting Software - mail to flume::puck) Wed Aug 30 1995 13:28

Date Of Receipt: 	30-AUG-1995 11:25:59.09
From: 	SMURF::FLUME::jmf "Joshua M. Friedman OSF/UNIX SDE  30-Aug-1995 1121"
To: 	sue@DEC:.zko.flume
CC: 	jmf@DEC:.zko.flume, decwet::anderson, odehelp@DEC:.zko.flume
Subj: 	seeking language-neutral comment characters for ODE merge markers

Suzanne, I thought perhaps someone in your group could help with this.

In the new ode bmerge functionality, it puts comments in the history to
identify what merges were done, however the comment delimiters which 
were chosen conflict with Pascal comments.  It would be nice if there
were a convention so we could search for these markers in an automated
way, so we'd like to find a new convention which wouldn't conflict with
any of the languages we use.

Thanks for any assistance you could provide on this.

			-josh & tina


------- Forwarded Message

From: [email protected] (Tina Anderson)
To: [email protected]
Cc: anderson
Subject: pascal doesn't handle {** and **}

Josh,

Welcome back from vacation.
Last week, a merge was made on a pascal file.
Well pascal does not handle embedded { } .

What this means is the tokens that we thought
would be unique, the {**  is causing problems
in pascal.

I gave the developer a workaround to turn off the 
creating of these.  save_ancestor_info FALSE

Options I see are:
	"** "  and " **"
	"[** " and "  **]"
        "#** " and " **#"


Anyway think about this.  Ask your group for
thoughts, since you are the ones who would search
for these.   I also would like to ask a compiler
person before changing the code if there might
be another unknown collision.  Do you have someone that 
could be asked in zk3?  

(note at the time, we choose the {**, we did ask
 a compiler person)


Till later,
Tina


Example:

[ ./ode/bin/sup/supscan.c ]
{** Merge Information **}
        {** Command used:       bmerge -visual **}
        {** Ancestor revision:  1.2.2.5 **}
        {** Merge revision:     1.2.2.4 **}
{** End **}

------- End of Forwarded Message