Re: [Zim-wiki] Using Zim within Dropbox or Ubuntu One
On Mon, Aug 2, 2010 at 4:15 PM, Jaap Karssenberg wrote: > Committed patch to trunk so we now have a checkbox "Shared Notebook" > in the properties dialog. This triggers ~/.cache to be used -- same as > for read-only notebooks. And I documented it in the manual. > Good good -- thanks! I was waiting around for that for mostly the same reasons as those discussed in this thread. ___ Mailing list: https://launchpad.net/~zim-wiki Post to : zim-wiki@lists.launchpad.net Unsubscribe : https://launchpad.net/~zim-wiki More help : https://help.launchpad.net/ListHelp
Re: [Zim-wiki] Using Zim within Dropbox or Ubuntu One
On Tue, Jul 27, 2010 at 10:22 AM, Jaap Karssenberg wrote: > On Tue, Jul 27, 2010 at 8:29 AM, Raphael Hertzog wrote: >> I have put a zim notebook under a Dropbox directory. Unfortunately this >> also includes the ".zim" directory containing files that are rewritten >> very often and that I would prefer to not have synced needlessly hundreds >> of times every day. >> >> Is there a way to tell Zim that this directory is somewhere else >> outside of the Dropbox directory? >> >> Ideally it should be able to use >> ".cache/zim/notebook-home_rhertzog_Dropbox_Notes/" >> like it already does for read-only directories AFAIU. >> >> It would be good to document this in the manual. > > In zim 0.2x the "slow fs" option was intended to do that. Need to fix > that option for zim 0.4x and will rename it to something like "remote > notebook" or "shared notebook". Committed patch to trunk so we now have a checkbox "Shared Notebook" in the properties dialog. This triggers ~/.cache to be used -- same as for read-only notebooks. And I documented it in the manual. Cheers! Jaap ___ Mailing list: https://launchpad.net/~zim-wiki Post to : zim-wiki@lists.launchpad.net Unsubscribe : https://launchpad.net/~zim-wiki More help : https://help.launchpad.net/ListHelp
Re: [Zim-wiki] Using Zim within Dropbox or Ubuntu One
On Wed, Jul 28, 2010 at 12:40 AM, Pedro wrote: > A conflict resolution GUI sounds too tricky IMHO. I can't see how that could > get much more intuitive than current time diff viewers such as meld or > winmerge. Pretty simple, we always have a "trunk" version that is shown as the current page. If there is any conflicting version we alert the user and allow to view it in a second window. This view will be read-only and preferably with textual changes highlighted (like meld, but more simplistic). Then we leave it up to the user to copy any changes he want back in the current version. Also the conflicting version will have a "discard" button which just deletes the conflicting version. Note that conflicts should only occur when editing the same parts of notes. Changes in other parts of the same note can easily be merged by bazaar. So assumption is that conflicts should not occur to frequent when using bazaar. When using dropbox or ubuntu one without bazaar they may occur a bit more often, but depends on your usage pattern. Regards, Jaap ___ Mailing list: https://launchpad.net/~zim-wiki Post to : zim-wiki@lists.launchpad.net Unsubscribe : https://launchpad.net/~zim-wiki More help : https://help.launchpad.net/ListHelp
Re: [Zim-wiki] Using Zim within Dropbox or Ubuntu One
I'm not sure if this is what was called slow file system option, but the possibility to use nothing else other than text files could be a quick yet usable fix. This could result in some performance issues, I guess. Is this doable? As for conflict resolution, it is a non-trivial process, to be honest i wouldn't recommend any less tech savy person to step into that hassle. Personally, I keep my notes on a bazaar repository and don't write any critical information on notes that are likely to get into version conflict. It's just too much work for an everyday task. Often, conflicts pop up in less important notes and i just push or pull with --overwrite option. A conflict resolution GUI sounds too tricky IMHO. I can't see how that could get much more intuitive than current time diff viewers such as meld or winmerge. Pedro On Tue, Jul 27, 2010 at 10:01 AM, Jaap Karssenberg < jaap.karssenb...@gmail.com> wrote: > On Tue, Jul 27, 2010 at 10:55 AM, Ralph J.Mayer > wrote: > >> Another nice idea would be a plugin detecting file conflits of > >> Dropbox/Ubuntu One and allowing to deal with them. (Both just create a > >> supplementary file with a special name with the conflicted version) > > > > I use Dropbox by adding GIT as glue between the local directory and > > the directory managed by Dropbox. > > > > Why invent conflict resolution a second time, its already there. > > > > I guess Bazaar with its integration to Zim is also able to handle this. > > This is a good solution when you resolve conflicts in the version > control manually. However this is not very convenient to wrap in a GUI > because the conflict markup can break formatting. So it is difficult > to show the conflict correctly. > > If we have a scheme working with separate reject files I intend to > wrap the bazaar integration to turn conflicts into separate conflict > files and use the same GUI to resolve them. > > So conflicts in version control and conflicts in zim structure are not > necessarily the same. > > Regards, > > Jaap > > ___ > Mailing list: https://launchpad.net/~zim-wiki > Post to : zim-wiki@lists.launchpad.net > Unsubscribe : https://launchpad.net/~zim-wiki > More help : https://help.launchpad.net/ListHelp > ___ Mailing list: https://launchpad.net/~zim-wiki Post to : zim-wiki@lists.launchpad.net Unsubscribe : https://launchpad.net/~zim-wiki More help : https://help.launchpad.net/ListHelp
Re: [Zim-wiki] Using Zim within Dropbox or Ubuntu One
On Tue, Jul 27, 2010 at 10:55 AM, Ralph J.Mayer wrote: >> Another nice idea would be a plugin detecting file conflits of >> Dropbox/Ubuntu One and allowing to deal with them. (Both just create a >> supplementary file with a special name with the conflicted version) > > I use Dropbox by adding GIT as glue between the local directory and > the directory managed by Dropbox. > > Why invent conflict resolution a second time, its already there. > > I guess Bazaar with its integration to Zim is also able to handle this. This is a good solution when you resolve conflicts in the version control manually. However this is not very convenient to wrap in a GUI because the conflict markup can break formatting. So it is difficult to show the conflict correctly. If we have a scheme working with separate reject files I intend to wrap the bazaar integration to turn conflicts into separate conflict files and use the same GUI to resolve them. So conflicts in version control and conflicts in zim structure are not necessarily the same. Regards, Jaap ___ Mailing list: https://launchpad.net/~zim-wiki Post to : zim-wiki@lists.launchpad.net Unsubscribe : https://launchpad.net/~zim-wiki More help : https://help.launchpad.net/ListHelp
Re: [Zim-wiki] Using Zim within Dropbox or Ubuntu One
Hello, > Another nice idea would be a plugin detecting file conflits of > Dropbox/Ubuntu One and allowing to deal with them. (Both just create a > supplementary file with a special name with the conflicted version) I use Dropbox by adding GIT as glue between the local directory and the directory managed by Dropbox. Why invent conflict resolution a second time, its already there. I guess Bazaar with its integration to Zim is also able to handle this. -- Viele Grüße / Kind Regards / Cordiali Saluti / Met vriendelijke groet Ralph J.Mayer xmpp:rma...@vinotech.de www.vinoblog.de mailto:rma...@vinotech.de ___ Mailing list: https://launchpad.net/~zim-wiki Post to : zim-wiki@lists.launchpad.net Unsubscribe : https://launchpad.net/~zim-wiki More help : https://help.launchpad.net/ListHelp
Re: [Zim-wiki] Using Zim within Dropbox or Ubuntu One
On Tue, Jul 27, 2010 at 8:29 AM, Raphael Hertzog wrote: > I have put a zim notebook under a Dropbox directory. Unfortunately this > also includes the ".zim" directory containing files that are rewritten > very often and that I would prefer to not have synced needlessly hundreds > of times every day. > > Is there a way to tell Zim that this directory is somewhere else > outside of the Dropbox directory? > > Ideally it should be able to use > ".cache/zim/notebook-home_rhertzog_Dropbox_Notes/" > like it already does for read-only directories AFAIU. > > It would be good to document this in the manual. In zim 0.2x the "slow fs" option was intended to do that. Need to fix that option for zim 0.4x and will rename it to something like "remote notebook" or "shared notebook". > Another nice idea would be a plugin detecting file conflits of > Dropbox/Ubuntu One and allowing to deal with them. (Both just create a > supplementary file with a special name with the conflicted version) Sure - there is even a E50,- bounty open for adding a conflict resolution mechanism to zim. (And considering to raise that, as we get in more donations and no bounties have been claimed so far...) Bounties are here: http://zim-wiki.org/contribute.html dev notes here: http://www.zim-wiki.org/wiki/doku.php?id=resolving_syncing_conflicts First step is probably to document the file naming scheme used by Dropbox/Ubuntu One for conflicts and see if we can support both at once, or need some option to switch schemes. Regards, Jaap ___ Mailing list: https://launchpad.net/~zim-wiki Post to : zim-wiki@lists.launchpad.net Unsubscribe : https://launchpad.net/~zim-wiki More help : https://help.launchpad.net/ListHelp
