zim-wiki team mailing list archive

[Pedro <pedro100@xxxxxxxxx>]

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.karssenberg@xxxxxxxxx> wrote:

> On Tue, Jul 27, 2010 at 10:55 AM, Ralph J.Mayer <rmayer@xxxxxxxxxxx>
> 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@xxxxxxxxxxxxxxxxxxx
> Unsubscribe : https://launchpad.net/~zim-wiki
> More help   : https://help.launchpad.net/ListHelp
>