Richard Möhn
Richard Möhn
The test suite passes for me. I just checked again that the strange thing still occurs by resetting to master, inserting `cat ${TEMP}.local-only >> /tmp/lo.po` and running `rake2.1 spec` again....
Thanks for the explanation. I've experimented a bit and perhaps found out why `${TEMP}.local-only` contains a message that was also changed on remote. You determine the local-only things with this...
I also tried your suggestion for the `-Xours` option. It doesn't quite work, because neither of `${TEMP}.unchanged`, `${TEMP}.local-changes` and `${TEMP}.remote-changes` contains a definition for "This little piggie is added on...
Messing around with msgcat and friends is all too confusing to me. I now implemented the merge-favouring-ours in Python with [polib](https://polib.readthedocs.org/en/latest/index.html) and that was much easier. Not closing this issue,...
@webknjaz, sorry, I can't help you with this. I wrote the recipe more than five years ago and I haven't used pygit2 since.
Cool. Thanks a lot for the quick fix!
The same goes for `hypertext.Subquestion`. Make it a `namedtuple` or a Python 3.7 `dataclass`.
The construction of `Workspace`s is similarly repetitive.
Another scenario: ``` What is your root question? > ask 0 Question: [$1: ask 0] Scratchpad: [$2: ] Subquestions: > ask $2 Question: [$1: ask 0] Scratchpad: [$2: ] Subquestions:...
Another scenario: ``` What is your root question? > 0 Question: [$1: 0] Scratchpad: [$2: ] Subquestions: > ask / Question: [$1: 0] Scratchpad: [$2: ] Subquestions: 1. [$q1: /]...