# HG changeset patch # User Jan Vrany # Date 1441700135 -3600 # Node ID 679fd1f9a25bfc68d00073b69fb1bd4378c3f373 # Parent ecf04090fc50927e178c218eec2af0948eaf36c1 Oops, re-added list splicemap for stx:goodies/petitparser/compiler It somehow got lost during merge diff -r ecf04090fc50 -r 679fd1f9a25b compiler/stx_goodies_petitparser_compiler.st --- a/compiler/stx_goodies_petitparser_compiler.st Tue Sep 08 03:20:10 2015 +0100 +++ b/compiler/stx_goodies_petitparser_compiler.st Tue Sep 08 09:15:35 2015 +0100 @@ -34,6 +34,32 @@ "Created: / 03-10-2014 / 01:47:26 / Jan Vrany " "Modified: / 26-10-2014 / 01:27:26 / Jan Vrany " +! + +monticelloSplicemap + "Return a splicemap for this package. This is used to forge a + 'fake' ancestor when generating ancestry information out of + Mercurial (or anyt other) history. This should make merging + back into Squeak/Pharo a little easier as Monticello can (in theory) + find a proper ancestor. + + All this requires monticelloSplicemap being updated each time a code + is merged from Monticello. + + The format of splicemap is a flat array of pairs + (commit id, MCVersionInfo to splice) as literal encoding. + " + + ^ #( + #(HGChangesetId 'f6f68d32de73') #(MCVersionInfo name: 'PetitCompiler-JanVrany.170' id: 'c20a744f-3b41-4aaa-bb8a-71ce74a2a952' date: '2015-08-24' time: '15:19:51.340' author: 'JanVrany' message: 'Removed CompiledMethod>>source + +Use #sourceCode which is defined in Smalltalk/X for Squeak/Pharo +compatibility. This makes merging easier as merging as this +version #source have disastrous effects on running Smalltalk/X +system - #source is the main source acessing method there. +') + + ) ! ! !stx_goodies_petitparser_compiler class methodsFor:'description'!