zim-wiki team mailing list archive

[Chuck Esterbrook <chuck.esterbrook@xxxxxxxxx>]

Thanks Stephen. This is working well for me. The diff/merge feature is
brilliant and the "Auto Merge" is the frosting on the cake. Thanks to
Jouhaka and Irq3000 for coding and testing this.

The patch was updated against 0.68 in March 2018. After checking diffs
between 0.68 and 0.69 and reading the patch source code, I didn't see any
conflicts. I was able to apply it to 0.69 with no issues. I did so with:

cd zim-0.69
wget https://github.com/zim-desktop-wiki/zim-desktop-wiki/pull/178.diff
patch -p1 < 178.diff

-Chuck


On Sat, Jan 26, 2019 at 5:13 PM Stephen LARROQUE <lrq3000@xxxxxxxxx> wrote:

> Dear Chuck,
>
> I indeed experienced the same issue, and a contributor named Jouhaka made
> a patch to allow overwriting disk changes by clicking a button (or to do an
> automatic 3 way merge). I use this patch since a year now, it's working
> perfectly fine. It's for Zim v0.67. You can find it here:
> https://github.com/zim-desktop-wiki/zim-desktop-wiki/pull/178
>
> Best regards,
> Stephen
>
> Le sam. 26 janv. 2019 à 23:43, Chuck Esterbrook <
> chuck.esterbrook@xxxxxxxxx> a écrit :
>
>> Hi,
>>
>> I have a problem where Zim often says:
>>
>> Could not save page
>>
>> File changed on disk: (path)
>>
>> To continue you can save a copy of this page or discard
>> any changes. If you save a copy changes will be also
>> discarded, but you can restore the copy later.
>>
>> I'm using Dropbox for file syncing, though I think the issue I describe
>> here would happen for other file syncing services as well, The steps:
>>
>> - Edit a notebook page on one machine.
>> - Save.
>> - File is synced to cloud.
>> - Go to another machine where notebook page is already open.
>> - File is synced *from* the cloud. Now it no longer matches Zim's memory.
>> - Edit the page in Zim.
>> - Save.
>> - Error message: Could not save page...
>>
>> I understand what's happening. My question is whether this can be
>> mitigated with a plugin, patch, hidden setting or other technique? If Zim
>> automatically reloaded pages that were not modified in memory that had been
>> modified on disk, that would cure 99% of the issue.
>>
>> Also, has this been discussed before? I searched around the web and the
>> list but didn't get any good hits.
>>
>> I'm on Zim 0.68 on Mac and Windows 10 if that matters.
>>
>> -Chuck
>>
>> _______________________________________________
>> Mailing list: https://launchpad.net/~zim-wiki
>> Post to     : zim-wiki@xxxxxxxxxxxxxxxxxxx
>> Unsubscribe : https://launchpad.net/~zim-wiki
>> More help   : https://help.launchpad.net/ListHelp
>>
>