Public SourceMage Discussion List

[Jaka Kranjc <lynx AT mages.ath.cx>]

On Thursday 31 of May 2007 17:49:40 you wrote:
> > For proper HISTORY integrations, we figured long ago that we just need to
> > write our own merge (strategy) script and somehow plug it in. Since it
> > would be custom, it could be made to support anything we wanted.
>
> In that case as well the additions to the history file would probably
> make writing that merge strategy script easier to do.
Perhaps, but I think a simple manipulation/inspection of the diff would do:
if it doesn't add a title, grab the first one upwards
if it does
  if it is last move it at the start

and sed the new block in.

I'll try to write a strategy this weekend.

-- 
We cannot command nature except by obeying her.  --Sir Francis Bacon
Have a sourcerous day! www.sourcemage.org

Attachment: signature.asc
Description: This is a digitally signed message part.