Re: Need help merging dev/rune into master

[Neil Puttock]

2008/7/4 Neil Puttock <address@hidden>:
> Hi Valentin,
>
> 2008/7/3 Valentin Villenave <address@hidden>:
>
>> So far I've been merging his branch without trouble, but now there's a
>> (minor) conflict in the C++ code that I don't know how to handle :-(
>> Could anyone with a clue have a look at it, and either send me a patch
>> or even push the merging (either onto Rune's branch or onto a
>> temporary branch)?
>
> I hope you've managed to resolve the problem, but in case it's proven
> too problematic, here's a patch which you can apply which seems to
> work for me - I've tested it with #(set-accidental-style
> 'dodecaphonic), which compiles without a problem.
>
> The patch basically collates all Rune's changed files relating to the
> accidental improvements, with the following changes:
>
> - ignored the News entry
> - ignored the convert rule change (which is unrelated to the accidental 
> changes)
> - since Joe has changed context.cc quite a bit to fix Issue 65, the
> patch reverts this file back to the older revision
> - fixed the scheme type checks in key-entry.cc (e.g. scm_is_int, which
> should be scm_is_integer)
> - changed the docs refs in define-context-properties.scm (@rinternals{})
>
> There might be some other changes, but I've lost track by now. :)
>
> BTW, I tried to do a regression test check to make sure it's working
> properly, but it seems to break chordmode; I trust you don't need that
> for your score.
>
> Regards,
> Neil

Oops, I forgot the size limit on attachments; here's a an archived
version which should get through OK.

0001-Flexible-accidentals-from-dev-rune.patch.tar.gz
Description: GNU Zip compressed data