Space repetition

[chadjoan]

This is for issue #82: Request: allow the Spacing nonterminal to decide how repitition is handled.

Be sure to merge the changes in the wiki repository first. I created a space_repetition branch there to hold those.

This is a breaking change, because the predefined spacing parser is now define as spacing <- :blank* instead of spacing <~ blank+. Apply when convenient.

[PhilippeSigaud]

Can you remind me how to merge the changes in the wiki first?

[chadjoan]

I couldn't find any way to facilitate the wiki changes through github. It seems to both give the wiki its own repository, but then neglect to give it the pull-request kind of functionality that we expect from main repositories :/

Thus, I would suggest doing it the old-fashioned way, at least until someone suggests better:

cd <your local pegged dir>/pegged/docs/wiki
git fetch origin
git checkout master
git merge space_repetition
git push origin

I can't test these steps without actually doing the deed, so I may have missed something necessary to ensure that the space_repetition branch appears locally before you do the merge. Hopefully this is enlightening enough, though.

[PhilippeSigaud]

Yeah, I'm only half convinced by the solution we tried. We will see...

We should add the steps on the wiki itself or the README, though. Le 18 nov. 2012 15:43, "cjoan" notifications@github.com a écrit :

I couldn't find any way to facilitate the wiki changes through github. It seems to both give the wiki its own repository, but then neglect to give it the pull-request kind of functionality that we expect from main repositories :/

Thus, I would suggest doing it the old-fashioned way, at least until someone suggests better:

cd /pegged/docs/wiki git fetch origin git checkout master git merge space_repetition git push origin

I can't test these steps without actually doing the deed, so I may have missed something necessary to ensure that the space_repetition branch appears locally before you do the merge. Hopefully this is enlightening enough, though.

— Reply to this email directly or view it on GitHubhttps://github.com/PhilippeSigaud/Pegged/pull/86#issuecomment-10486748.

[PhilippeSigaud]

On Sun, Nov 18, 2012 at 4:08 PM, Philippe Sigaud philippe.sigaud@gmail.comwrote:

Yeah, I'm only half convinced by the solution we tried. We will see...

We should add the steps on the wiki itself or the README, though.

I just added some instructions on README.md and on the wiki.

[PhilippeSigaud]

Ah, this cannot be automatically merged anymore.