Re: [FWP] Craft a conflict tag

["Abigail" <abigail@foad.org>]

On Mon, Apr 23, 2001 at 03:56:27PM +0100, Michael G Schwern wrote:
> I'm using the Aegis CASE tool which uses a utility called fhist to
> perform merges.  fhist uses the following marker to flag merge
> conflicts...
> 
> /-/-/-/-/-/-/-/-/-/-/-/-/  BEGIN CONFLICT   /-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/
> old conflicting code
> /-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/
> new conflicting code
> /-/-/-/-/-/-/-/-/-/-/-/-/  END CONFLICT   /-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/
> 
> After cleaning up a bad merge I accidentally left one of these flags
> in my code... and it compiled!  Turns out the flags are perfectly
> valid Perl (they do throw a warning) provided they appear at the end
> of a block or in some other way are terminated.
> 
> {
> /-/-/-/-/-/-/-/-/-/-/-/-/  END CONFLICT   /-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/-/
> }
> 
> That's syntactically valid perl, even under strict.


Just like:

  perl -e '* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
           / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / / 
           % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % % %;
           BEGIN {% % = ($ _ = " " => print "Just Another Perl Hacker\n")}'



Abigail

==== Want to unsubscribe from Fun With Perl?  Well, if you insist...
==== Send email to <fwp-request@technofile.org> with message _body_
====   unsubscribe