emacs-orgmode@gnu.org archives
 help / color / mirror / code / Atom feed
* syncing org-mode files on three unconnected machines?
@ 2009-02-09  3:43 Alan E. Davis
  2009-02-09  6:39 ` Carsten Dominik
                   ` (2 more replies)
  0 siblings, 3 replies; 7+ messages in thread
From: Alan E. Davis @ 2009-02-09  3:43 UTC (permalink / raw)
  To: emacs-orgmode Mailinglist


[-- Attachment #1.1: Type: text/plain, Size: 2012 bytes --]

I am studying and using git in several ways at work and at home, and hope to
dive further into the agenda possibilities.  I have been using org-mode at
work, on two machines, as well as at home, on my preferred main machine.  I
also would like to run emacs and org-mode sometimes on a laptop.  I am not
currently able to network or internetwork between them, due to various
firewall and wireless router issues that are beyond my level.

My question is basically how to keep the files consistent among the various
machines.  I have thought of at least two ways, but don't understand whether
either of them will work:

1.  I am now carrying around a USB flash drive with three ~/org trees from
three machines.  I have been trying to maintain important files by hand:
cutting and pasting headlines and their subtrees, then sorting the entire
target file.  Is there a canonical method for merging two files (basically
the same file on two different machines, edited at different times, with
some overlaps)?

2.  I am thinking git.  I'm uncertain about git at the best, so I don't know
how to implement this.  Is this reasonable?  A git archive is kept on a
flash drive.  It is updated from the drive of the current machine.  ~/org on
the current machine is also updated  from the git archive on the flash
drive.

I am currently struggling to get git working on all my ~/org trees.  Also, I
have set some files outside that tree as remember targets or with links to
be access from git files.  Somehow, those files will have to be hardlinked
on both or all three machines, meaning the machines will have to mirror each
other.

Somehow, any solution to this problem will need to be robust when I forget
my flash drive.

Am I dreaming?

Thank you,

Alan


-- 
Alan Davis

It is undesirable to believe a proposition when
there is no ground whatsoever for supposing it is true.
    ---- Bertrand Russell
They are ill discoverers that think there is no land, when they can see
nothing but sea.
    ----   Sir Francis Bacon

[-- Attachment #1.2: Type: text/html, Size: 2264 bytes --]

[-- Attachment #2: Type: text/plain, Size: 204 bytes --]

_______________________________________________
Emacs-orgmode mailing list
Remember: use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: syncing org-mode files on three unconnected machines?
  2009-02-09  3:43 syncing org-mode files on three unconnected machines? Alan E. Davis
@ 2009-02-09  6:39 ` Carsten Dominik
  2009-02-09  7:22 ` Thierry Volpiatto
       [not found] ` <e0e1fe620902090012j54286429v509cc2e5892225bd@mail.gmail.com>
  2 siblings, 0 replies; 7+ messages in thread
From: Carsten Dominik @ 2009-02-09  6:39 UTC (permalink / raw)
  To: Alan E. Davis; +Cc: emacs-orgmode Mailinglist

While I am using git myself, you may want to look into

    http://getdropbox.com/

I discovered this only recently, and keeping your org files
in the drop box may be a perfect solution.

- Carsten

On Feb 9, 2009, at 4:43 AM, Alan E. Davis wrote:

> I am studying and using git in several ways at work and at home, and  
> hope to dive further into the agenda possibilities.  I have been  
> using org-mode at work, on two machines, as well as at home, on my  
> preferred main machine.  I also would like to run emacs and org-mode  
> sometimes on a laptop.  I am not currently able to network or  
> internetwork between them, due to various firewall and wireless  
> router issues that are beyond my level.
>
> My question is basically how to keep the files consistent among the  
> various machines.  I have thought of at least two ways, but don't  
> understand whether either of them will work:
>
> 1.  I am now carrying around a USB flash drive with three ~/org  
> trees from three machines.  I have been trying to maintain important  
> files by hand: cutting and pasting headlines and their subtrees,  
> then sorting the entire target file.  Is there a canonical method  
> for merging two files (basically the same file on two different  
> machines, edited at different times, with some overlaps)?
>
> 2.  I am thinking git.  I'm uncertain about git at the best, so I  
> don't know how to implement this.  Is this reasonable?  A git  
> archive is kept on a flash drive.  It is updated from the drive of  
> the current machine.  ~/org on the current machine is also updated   
> from the git archive on the flash drive.
>
> I am currently struggling to get git working on all my ~/org trees.   
> Also, I have set some files outside that tree as remember targets or  
> with links to be access from git files.  Somehow, those files will  
> have to be hardlinked on both or all three machines, meaning the  
> machines will have to mirror each other.
>
> Somehow, any solution to this problem will need to be robust when I  
> forget my flash drive.
>
> Am I dreaming?
>
> Thank you,
>
> Alan
>
>
> -- 
> Alan Davis
>
> It is undesirable to believe a proposition when
> there is no ground whatsoever for supposing it is true.
>     ---- Bertrand Russell
> They are ill discoverers that think there is no land, when they can  
> see nothing but sea.
>     ----   Sir Francis Bacon
>
> _______________________________________________
> Emacs-orgmode mailing list
> Remember: use `Reply All' to send replies to the list.
> Emacs-orgmode@gnu.org
> http://lists.gnu.org/mailman/listinfo/emacs-orgmode

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: syncing org-mode files on three unconnected machines?
  2009-02-09  3:43 syncing org-mode files on three unconnected machines? Alan E. Davis
  2009-02-09  6:39 ` Carsten Dominik
@ 2009-02-09  7:22 ` Thierry Volpiatto
       [not found] ` <e0e1fe620902090012j54286429v509cc2e5892225bd@mail.gmail.com>
  2 siblings, 0 replies; 7+ messages in thread
From: Thierry Volpiatto @ 2009-02-09  7:22 UTC (permalink / raw)
  To: emacs-orgmode

Hi,
You can use git or mercurial (or other decentralized VC) to do that.
I use hg (mercurial).
To achieve that, you can do like that:
1) Initialize a repo in org-tree1
2) Clone org-tree1 to org-tree2 and org-tree3 (on the machine1)
2) Put these three org-tree on your usb-key
3) Put these three org-tree on the machine 2 and 3.

Thats all!

Now on any machine you can edit org-tree1, make changes, and just pull
changes from org-tree2 and 3. If you have your usb-key with you, pull
the change from the key, if not, you will do it later and synchronize
with the key on other machines.

For a better experience, use DVC with hg or git.


"Alan E. Davis" <lngndvs@gmail.com> writes:

> I am studying and using git in several ways at work and at home, and hope to
> dive further into the agenda possibilities.  I have been using org-mode at
> work, on two machines, as well as at home, on my preferred main machine.  I
> also would like to run emacs and org-mode sometimes on a laptop.  I am not
> currently able to network or internetwork between them, due to various
> firewall and wireless router issues that are beyond my level.
>
> My question is basically how to keep the files consistent among the various
> machines.  I have thought of at least two ways, but don't understand whether
> either of them will work:
>
> 1.  I am now carrying around a USB flash drive with three ~/org trees from
> three machines.  I have been trying to maintain important files by hand:
> cutting and pasting headlines and their subtrees, then sorting the entire
> target file.  Is there a canonical method for merging two files (basically
> the same file on two different machines, edited at different times, with
> some overlaps)?
>
> 2.  I am thinking git.  I'm uncertain about git at the best, so I don't know
> how to implement this.  Is this reasonable?  A git archive is kept on a
> flash drive.  It is updated from the drive of the current machine.  ~/org on
> the current machine is also updated  from the git archive on the flash
> drive.
>
> I am currently struggling to get git working on all my ~/org trees.  Also, I
> have set some files outside that tree as remember targets or with links to
> be access from git files.  Somehow, those files will have to be hardlinked
> on both or all three machines, meaning the machines will have to mirror each
> other.
>
> Somehow, any solution to this problem will need to be robust when I forget
> my flash drive.
>
> Am I dreaming?
>
> Thank you,
>
> Alan

-- 
A + Thierry Volpiatto
Location: Saint-Cyr-Sur-Mer - France

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: syncing org-mode files on three unconnected machines?
       [not found]   ` <7bef1f890902090448w452249c7y95f956999c00fc58@mail.gmail.com>
@ 2009-02-09 12:50     ` Alan E. Davis
  2009-02-09 14:49       ` Manish
  2009-02-09 15:54       ` Bernt Hansen
  0 siblings, 2 replies; 7+ messages in thread
From: Alan E. Davis @ 2009-02-09 12:50 UTC (permalink / raw)
  To: emacs-orgmode Mailinglist


[-- Attachment #1.1: Type: text/plain, Size: 828 bytes --]

Thank you for the immediate and helpful responses.

I have signed up for dropbox.  It looks useful.  I already have it working,
and I can drop the entire ~/org tree into it.

That being said, the most helpful would probably be the git approach.  It's
going to take some work.


Thank you,

Alan

-- 
Alan Davis

It is undesirable to believe a proposition when
there is no ground whatsoever for supposing it is true.
    ---- Bertrand Russell
They are ill discoverers that think there is no land, when they can see
nothing but sea.
    ----   Sir Francis Bacon




-- 
Alan Davis

It is undesirable to believe a proposition when
there is no ground whatsoever for supposing it is true.
    ---- Bertrand Russell
They are ill discoverers that think there is no land, when they can see
nothing but sea.
    ----   Sir Francis Bacon

[-- Attachment #1.2: Type: text/html, Size: 1128 bytes --]

[-- Attachment #2: Type: text/plain, Size: 204 bytes --]

_______________________________________________
Emacs-orgmode mailing list
Remember: use `Reply All' to send replies to the list.
Emacs-orgmode@gnu.org
http://lists.gnu.org/mailman/listinfo/emacs-orgmode

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: syncing org-mode files on three unconnected machines?
  2009-02-09 12:50     ` Alan E. Davis
@ 2009-02-09 14:49       ` Manish
  2009-02-09 15:54       ` Bernt Hansen
  1 sibling, 0 replies; 7+ messages in thread
From: Manish @ 2009-02-09 14:49 UTC (permalink / raw)
  To: Alan E. Davis; +Cc: emacs-orgmode Mailinglist

On Mon, Feb 9, 2009 at 6:20 PM, Alan E. Davis wrote:
>
> I have signed up for dropbox. It looks useful. I already have it working,
> and I can drop the entire ~/org tree into it.
>
> That being said, the most helpful would probably be the git approach. It's
> going to take some work.

May be a private git repo on Github?

-- 
Manish

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: syncing org-mode files on three unconnected machines?
  2009-02-09 12:50     ` Alan E. Davis
  2009-02-09 14:49       ` Manish
@ 2009-02-09 15:54       ` Bernt Hansen
  2009-02-09 17:25         ` Matthew Lundin
  1 sibling, 1 reply; 7+ messages in thread
From: Bernt Hansen @ 2009-02-09 15:54 UTC (permalink / raw)
  To: Alan E. Davis; +Cc: emacs-orgmode Mailinglist

"Alan E. Davis" <lngndvs@gmail.com> writes:

> Thank you for the immediate and helpful responses. 
>
> I have signed up for dropbox.  It looks useful.  I already have it working, and I can drop the entire ~/org tree into it. 
>
> That being said, the most helpful would probably be the git approach.  It's going to take some work.

Hi Alan,

I've never done this myself but it should be possible to put a bare git
repository on the USB stick.  Then you push/pull changes to it when
moving from one machine to the next.

It would go something like this: (untested)

On the USB stick - initialize a bare repository

cd /path/to/usb
git clone --bare /path/to/your/repo

Now on each of the org repos:

Rename your repo (just to keep a backup until you're comfortable you
have it set up the way you like) and clone the one from the usb stick.

Copy the files from the renamed repo into the newly cloned repo and
check for difference.  This just makes sure you don't lose current work
in the other repos.

After that is set up you can git pull from the usb stick and git push
back to it with new commits.

HTH,
Bernt

^ permalink raw reply	[flat|nested] 7+ messages in thread

* Re: Re: syncing org-mode files on three unconnected machines?
  2009-02-09 15:54       ` Bernt Hansen
@ 2009-02-09 17:25         ` Matthew Lundin
  0 siblings, 0 replies; 7+ messages in thread
From: Matthew Lundin @ 2009-02-09 17:25 UTC (permalink / raw)
  To: Bernt Hansen; +Cc: emacs-orgmode Mailinglist


Hi Alan

Bernt Hansen <bernt@norang.ca> writes:
>
>
> I've never done this myself but it should be possible to put a bare git
> repository on the USB stick.  Then you push/pull changes to it when
> moving from one machine to the next.
>
> It would go something like this: (untested)
>
> On the USB stick - initialize a bare repository
>
> cd /path/to/usb
> git clone --bare /path/to/your/repo
>

I do precisely what Bernt outlines here so clearly and it works great. I
keep a bare repo on a USB drive and push and pull changes to it. (Magit,
an emacs mode for managing git commits and history, works wonders here.)

I haven't forgotten my USB drive yet, but if you're worried about that,
you could always put the repository on a server. Also, if I were to
forget the USB drive, I would simply create a branch and email myself a
patch or patches at the end of the day and then merge them with the
working copy on one of the other machines.

The beauty of git (or other distributed version control systems) is that
your complete history is in multiple places, so if you lose the USB
drive, you can simply get a new one and put a bare repository on that.
(Of course, if you're worried about data security, I wouldn't recommend
an unencrypted USB drive.)

Best,
Matt

 

^ permalink raw reply	[flat|nested] 7+ messages in thread

end of thread, other threads:[~2009-02-09 17:25 UTC | newest]

Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2009-02-09  3:43 syncing org-mode files on three unconnected machines? Alan E. Davis
2009-02-09  6:39 ` Carsten Dominik
2009-02-09  7:22 ` Thierry Volpiatto
     [not found] ` <e0e1fe620902090012j54286429v509cc2e5892225bd@mail.gmail.com>
     [not found]   ` <7bef1f890902090448w452249c7y95f956999c00fc58@mail.gmail.com>
2009-02-09 12:50     ` Alan E. Davis
2009-02-09 14:49       ` Manish
2009-02-09 15:54       ` Bernt Hansen
2009-02-09 17:25         ` Matthew Lundin

Code repositories for project(s) associated with this inbox:

	https://git.savannah.gnu.org/cgit/emacs/org-mode.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).