Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-09 Thread Rasmus
Xebar, > its funny you just posted this as of all the excellent responses in this > thread i was looking into git-annex as a solution. The issue is that im not > very technical (im an academic not a programmer) and its seems mighty > complicated. Also in addition git-assistant is currently isnt av

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-08 Thread Xebar Saram
Thx Chris its funny you just posted this as of all the excellent responses in this thread i was looking into git-annex as a solution. The issue is that im not very technical (im an academic not a programmer) and its seems mighty complicated. Also in addition git-assistant is currently isnt availab

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-08 Thread Christopher Allan Webber
Ian Barton writes: > On 01/07/13 13:06, Xebar Saram wrote: >> Hi all >> >> I have been using dropbox since i started using orgmode a few weeks ago >> (yeah im a neewb :)), which kinda works but i find it very annoying as >> it keeps creating conflicted copies, isnt reliable on my Linux main >> mac

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-04 Thread Nicolas Richard
Ian Barton writes: > I used to use Dropbox and git. However, as you have found I often got > "Conflicted Files". This is a particular problem if it happens in your > .git folder, because it can lead to a corrupt git repo. Even though I > have a remote git repo, this still lead to lots of wasted ti

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-04 Thread Ian Barton
On 01/07/13 13:06, Xebar Saram wrote: Hi all I have been using dropbox since i started using orgmode a few weeks ago (yeah im a neewb :)), which kinda works but i find it very annoying as it keeps creating conflicted copies, isnt reliable on my Linux main machine etc etc.. I was wondering what

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-04 Thread Alan Schmitt
fatkasuvayu+li...@gmail.com writes: > On Tue, Jul 02, 2013 at 04:27:27PM +0200, Alan Schmitt wrote: >> >> If someone can show me how to launch ediff from the command line, I can >> explain how to set up Unison for it (I found this old question >> http://superuser.com/questions/81958/how-to-make-e

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-03 Thread Julien Cubizolles
Alan Schmitt writes: > devn...@karl-voit.at writes: > >> Unison does not offer any merge functionality. However, you can >> easily use third party tools to handle merge conflicts (Emacs, vim, >> ...). > > (Disclaimer, I participate in Unison's development). Just to clarify > what I think Karl is

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-03 Thread Nick Dokos
"G. Martin Butz" writes: > I wrote a blog entry about the issue [1], but it's in German. If you > interested I can give further information in English. > The Chromium browser did an OK job of translating it: I think the translation is rough but readable. > > [1] >

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-03 Thread G. Martin Butz
Hi Itai, you have been given a lot of detailed advice, so I do not know, if my contribution will add anything. I have made good experiences with a combination of unison and git. I currently synchonise my netbook and my laptop; it is a rather simple and homebrew setup but it works for my pupo

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-03 Thread Samuel Loury
Hi, Xebar Saram writes: > I was wondering what you guys do for syncing org files between PC's, Os's, > devices (android etc).. There have been lot's of awesome solutions provided in this thread. Mine is quite similar but I think it is worth describing it anyway. I use git (a hand made script¹)

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-02 Thread Simon Thum
Hi, I use git-sync against my own server, and replicate mobileOrg to a webdav directory from there. https://github.com/simonthum/git-sync git-sync is intended for people who are git-savy, though. Cheers, Simon On 07/01/2013 02:06 PM, Xebar Saram wrote: Hi all I have been using dropbox

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-02 Thread Juan G .
Xebar Saram gmail.com> writes: > Alan, a unison guide focused on org would be great as some of the guys mentioned. As an example, I use the following ~/.unison/Org.prf file to sync files between Org folders on a Debian Linux laptop and an Android phone: # Unison preferences label = Org-mode roo

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-02 Thread Suvayu Ali
On Tue, Jul 02, 2013 at 06:11:14PM +0200, David Engster wrote: > Suvayu Ali writes: > > That said, I think you might be right. Possibly it could be resolved by > > just changing the algorithm, I don't know why I never tried that though. > > You might want to try setting diff.algorithm to 'patienc

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-02 Thread David Engster
Suvayu Ali writes: > That said, I think you might be right. Possibly it could be resolved by > just changing the algorithm, I don't know why I never tried that though. You might want to try setting diff.algorithm to 'patience' and maybe also raise diff.context to something like 6 or so if that do

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-02 Thread Suvayu Ali
Hi David, On Tue, Jul 02, 2013 at 05:59:36PM +0200, David Engster wrote: > Suvayu Ali writes: > > I have noticed that git *always* conflicts with TODO state changes. It > > seems changes to a headline is not easy to resolve. > > You mean you change state in a file and git fails to merge this on

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-02 Thread Suvayu Ali
On Tue, Jul 02, 2013 at 04:27:27PM +0200, Alan Schmitt wrote: > > If someone can show me how to launch ediff from the command line, I can > explain how to set up Unison for it (I found this old question > http://superuser.com/questions/81958/how-to-make-emacsclient-wait-when-using-the-eval-option

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-02 Thread David Engster
Suvayu Ali writes: > I have noticed that git *always* conflicts with TODO state changes. It > seems changes to a headline is not easy to resolve. You mean you change state in a file and git fails to merge this on the other side, although you didn't change the same line there? I've never seen such

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-02 Thread Brett Viren
Alan Schmitt writes: > Well, what would be there? If there is (and there may be) an external > tool that knows how to merge org files (it can be a 3-way merge, if it > makes things simpler), I could try to devise the magical incantation to > use it. It is not org-specific, but meld [1] is a Free

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-02 Thread Alan Schmitt
ras...@gmx.us writes: > Alan Schmitt writes: > >>> Alan, how about a short how-to on Worg about Unison and Org-mode >>> methods? >> >> Well, what would be there? If there is (and there may be) an external >> tool that knows how to merge org files (it can be a 3-way merge, if it >> makes things si

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-02 Thread Rasmus
Alan Schmitt writes: >> Alan, how about a short how-to on Worg about Unison and Org-mode >> methods? > > Well, what would be there? If there is (and there may be) an external > tool that knows how to merge org files (it can be a 3-way merge, if it > makes things simpler), I could try to devise th

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-02 Thread Alan Schmitt
Hello Karl, devn...@karl-voit.at writes: > Alan, how about a short how-to on Worg about Unison and Org-mode > methods? Well, what would be there? If there is (and there may be) an external tool that knows how to merge org files (it can be a 3-way merge, if it makes things simpler), I could try t

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-02 Thread Xebar Saram
Wow thx guys, so many great tips ill slowly start looking into them. as i said i am a neewb (and not to technical :)). Alan, a unison guide focused on org would be great as some of the guys mentioned. best to all and thx alot for the info its truly helpful take care -Itai On Tue, Jul 2, 2013

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-02 Thread Suvayu Ali
Hello, On Mon, Jul 01, 2013 at 01:25:26PM -0300, Tomas Grigera wrote: > On Mon, Jul 1, 2013 at 1:10 PM, Brian van den Broek < > brian.van.den.br...@gmail.com> wrote: > > > > bzr and hg are (superficially?) easier and git is pretty dominant. [...chomp...chomp...chomp...] > But I agree with Brian

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-02 Thread Myles English
Hi, Rasmus writes: > Another option is Git Annex. In my experience, it takes some effort > to get used to it, but perhaps less so if you're used to git. One can > configure it to use regular git for e.g. text files. It's build with > Haskell (and success of building it is more or less random)

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-02 Thread Rasmus
Hi, Nice discussion. I hope it makes it into a Worg page eventually :) Karl Voit writes: > * Alan Schmitt wrote: >> Just to clarify what I think Karl is saying: one can plug in >> external tools to handle merge into unison, these tools can be >> specialized depending on the file name (for inst

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-02 Thread Karl Voit
* Alan Schmitt wrote: > devn...@karl-voit.at writes: > >> Unison does not offer any merge functionality. However, you can >> easily use third party tools to handle merge conflicts (Emacs, vim, >> ...). > > (Disclaimer, I participate in Unison's development). Jay! \o/ > Just to clarify what I th

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-02 Thread Alan Schmitt
devn...@karl-voit.at writes: > Unison does not offer any merge functionality. However, you can > easily use third party tools to handle merge conflicts (Emacs, vim, > ...). (Disclaimer, I participate in Unison's development). Just to clarify what I think Karl is saying: one can plug in external t

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-01 Thread Karl Voit
* Tomas Grigera wrote: > > To me, a rather reliable way (without version control) has been unison. > Easy to set up and learn, fast. Only problem is that it doesn't deal well > (actually, at all) with merges (i.e. a file that has been modified in both > computers). I am using Unison File Synchr

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-01 Thread Ramon Diaz-Uriarte
Hi Itai, zelt...@gmail.com writes: > Hi all > > I have been using dropbox since i started using orgmode a few weeks ago > (yeah im a neewb :)), which kinda works but i find it very annoying as it > keeps creating conflicted copies, isnt reliable on my Linux main machine > etc etc.. > I was wonde

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-01 Thread Tomas Grigera
On Mon, Jul 1, 2013 at 1:10 PM, Brian van den Broek < brian.van.den.br...@gmail.com> wrote: > > On Jul 1, 2013 8:26 AM, "Xebar Saram" wrote: > > > > Hi all > > > > I have been using dropbox since i started using orgmode a few weeks ago > (yeah im a neewb :)), which kinda works but i find it very

Re: [O] advice needed: how do you guys sync org files between devices?

2013-07-01 Thread Brian van den Broek
On Jul 1, 2013 8:26 AM, "Xebar Saram" wrote: > > Hi all > > I have been using dropbox since i started using orgmode a few weeks ago (yeah im a neewb :)), which kinda works but i find it very annoying as it keeps creating conflicted copies, isnt reliable on my Linux main machine etc etc.. > > I was

[O] advice needed: how do you guys sync org files between devices?

2013-07-01 Thread Xebar Saram
Hi all I have been using dropbox since i started using orgmode a few weeks ago (yeah im a neewb :)), which kinda works but i find it very annoying as it keeps creating conflicted copies, isnt reliable on my Linux main machine etc etc.. I was wondering what you guys do for syncing org files betwee