Article: Synchronizing org Files Using bzr and git

Article: Synchronizing org Files Using bzr and git

[Ian Barton]

I have been working on an article on syncing org files using a version 
control system for a while. The recent posts about using a usb stick 
motivated me to try and finish it.

You can see the html version at 
http://www.ian-barton.com/ian-barton/org_vcs/org_vcs.html and get the 
current version from github at 
git://github.com/geekinthesticks/org-vcs.git .

This is still a work in progress, but I would welcome any comments. 
Since it's available via github and I am lazy, please feel free to edit 
it yourself:)

A couple of observations:

I have tried to strike a balance between describing something that works 
and avoiding too many minutiae of VCS options.

I am using bzr myself (although I might switch). I am aware that most 
people on the list use git, so I have tried to give both git and bzr 
examples. If the git ones are wrong, please let me know!

If Carsten thinks it's suitable I would be happy for the article to end 
up on worg, or wherever he thinks appropriate.

Ian.

Re: Article: Synchronizing org Files Using bzr and git

[Mark Elston]

Just a note.  Be careful of the use of colors.  For example,
you have quoted strings in yellow in section 3.3.  This color
makes the strings almost invisible on my screen.  This makes
it hard to read.

Also, is there a single-page or pdf version of this material?

Mark

* Ian Barton wrote (on 3/3/2009 5:42 AM):
> I have been working on an article on syncing org files using a version 
> control system for a while. The recent posts about using a usb stick 
> motivated me to try and finish it.
> 
> You can see the html version at 
> http://www.ian-barton.com/ian-barton/org_vcs/org_vcs.html and get the 
> current version from github at 
> git://github.com/geekinthesticks/org-vcs.git .
> 
> This is still a work in progress, but I would welcome any comments. 
> Since it's available via github and I am lazy, please feel free to edit 
> it yourself:)
> 
> A couple of observations:
> 
> I have tried to strike a balance between describing something that works 
> and avoiding too many minutiae of VCS options.
> 
> I am using bzr myself (although I might switch). I am aware that most 
> people on the list use git, so I have tried to give both git and bzr 
> examples. If the git ones are wrong, please let me know!
> 
> If Carsten thinks it's suitable I would be happy for the article to end 
> up on worg, or wherever he thinks appropriate.
> 
> Ian.
> 
> 
> _______________________________________________
> 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
> 
> 
> 

Re: Article: Synchronizing org Files Using bzr and git

[Yuval Hager]

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

On Tuesday 03 March 2009, Ian Barton wrote:
> I have been working on an article on syncing org files using a version
> control system for a while. The recent posts about using a usb stick
> motivated me to try and finish it.
>
> You can see the html version at
> http://www.ian-barton.com/ian-barton/org_vcs/org_vcs.html and get the
> current version from github at
> git://github.com/geekinthesticks/org-vcs.git .
>

Thank you for the writeup - very useful! It came exactly on time when I plan 
to start doing exactly that. :)

the HTML export is quite annoying, so reading this on org-mode or pdf was much 
preferred on my end.

--y

[-- Attachment #1.2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 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

Re: Article: Synchronizing org Files Using bzr and git

[Ian Barton]

Mark Elston wrote:
> Just a note.  Be careful of the use of colors.  For example,
> you have quoted strings in yellow in section 3.3.  This color
> makes the strings almost invisible on my screen.  This makes
> it hard to read.
> 
> Also, is there a single-page or pdf version of this material?
> 
Mark,
Sorry about the yellow I hadn't noticed it. I am trying to fix it, but 
it seems to be defeating my very limited css skills. The css generated 
by org is:

<pre class="src src-emacs-shell">
*~
</pre>

<pre class="src src-emacs-shell">
bzr add *.org
</pre>

In my stylesheet I am trying things like:

pre.src {
	font-style: bold;
	color: black;
	
}

span.src-emacs-shell {color: black;}

However, I can't get the span (which should affect the quoted text) to 
work. I would appreciate it if someone could point me in the righ direction.

Once I have sorted this I will generate a PDF version.

Ian.

Re: Article: Synchronizing org Files Using bzr and git

[Carsten Dominik]

Hi Ian,

nice work!

On Mar 3, 2009, at 2:42 PM, Ian Barton wrote:

> I have been working on an article on syncing org files using a  
> version control system for a while. The recent posts about using a  
> usb stick motivated me to try and finish it.
>
> You can see the html version at http://www.ian-barton.com/ian-barton/org_vcs/org_vcs.html 
>  and get the current version from github at git://github.com/ 
> geekinthesticks/org-vcs.git .
>
> This is still a work in progress, but I would welcome any comments.  
> Since it's available via github and I am lazy, please feel free to  
> edit it yourself:)
>
> A couple of observations:
>
> I have tried to strike a balance between describing something that  
> works and avoiding too many minutiae of VCS options.
>
> I am using bzr myself (although I might switch). I am aware that  
> most people on the list use git, so I have tried to give both git  
> and bzr examples. If the git ones are wrong, please let me know!
>
> If Carsten thinks it's suitable I would be happy for the article to  
> end up on worg, or wherever he thinks appropriate.

First of all, I do not control in any way what gets on Worg.
Bastien set up Worg as user-edited content, and this is what
it should be.

If you aks my opinion, I think your tutorial is *exactly* what
Worg was made for!  I have not studied it in detail, but
it looks useful, addresses a subject that has almost become
a FAQ.  And if it is up on Worg, bugs will be fixed
and improvements made.

So please feel free to add your tutorial to Worg.
The best place would be the org-tutorial directory, and
you should then make a link from the index.org in that
same directory.  After pushing, it will take 1.5 hours or
less to appear on the web.

Thanks!

- Carsten

Re: Article: Synchronizing org Files Using bzr and git

[Cameron Horsburgh]

On Tue, Mar 03, 2009 at 01:42:56PM +0000, Ian Barton wrote:
> I have been working on an article on syncing org files using a version  
> control system for a while. The recent posts about using a usb stick  
> motivated me to try and finish it.
>
> You can see the html version at  
> http://www.ian-barton.com/ian-barton/org_vcs/org_vcs.html and get the  
> current version from github at  
> git://github.com/geekinthesticks/org-vcs.git .
>


Hi Ian,

This tutorial was great. I've been using bzr for most of my text files
(including org) for some time now, and I'm glad I'm not the only one!
I picked up on a couple of things I hadn't thought of, so thanks!

I just want to point out a ssmall typo. In Section 8.2.1 'Moving Your
Data from bzr to git' you say...

,----
| 
| Like most things this is easy once you know how. You need the bzr fast-export plugin. 
|
`----

I think you mean the 'fast import' plug-in. The rest of the paragraph
makes this pretty clear, but I can see some poor newbie trying to
figure this out!

Well done, and I look forward to seeing any additions you might make.


-- 

Cameron Horsburgh

Blog: http://spiritcry.wordpress.com/

Re: Article: Synchronizing org Files Using bzr and git

[Bernt Hansen]

Ian Barton <lists@manor-farm.org> writes:

> Mark Elston wrote:
>> Just a note.  Be careful of the use of colors.  For example,
>> you have quoted strings in yellow in section 3.3.  This color
>> makes the strings almost invisible on my screen.  This makes
>> it hard to read.
>>
>> Also, is there a single-page or pdf version of this material?
>>
> Mark,
> Sorry about the yellow I hadn't noticed it. I am trying to fix it, but
> it seems to be defeating my very limited css skills. The css generated
> by org is:
>
> <pre class="src src-emacs-shell">
> *~
> </pre>
>
> <pre class="src src-emacs-shell">
> bzr add *.org
> </pre>
>
> In my stylesheet I am trying things like:
>
> pre.src {
> 	font-style: bold;
> 	color: black;
> 	
> }
>
> span.src-emacs-shell {color: black;}
>
> However, I can't get the span (which should affect the quoted text) to
> work. I would appreciate it if someone could point me in the righ
> direction.
>
> Once I have sorted this I will generate a PDF version.

The span has a hardcoded style element which specifies the colour

<span style="color: rgb(255, 255, 85);">"Imported sources."</span>

I don't think you will be able to override that with CSS.  You need to
somehow remove the embedded style from the exported source.

-Bernt

Re: Re: Article: Synchronizing org Files Using bzr and git

[Carsten Dominik]

On Mar 4, 2009, at 3:37 PM, Bernt Hansen wrote:

> Ian Barton <lists@manor-farm.org> writes:
>
>> Mark Elston wrote:
>>> Just a note.  Be careful of the use of colors.  For example,
>>> you have quoted strings in yellow in section 3.3.  This color
>>> makes the strings almost invisible on my screen.  This makes
>>> it hard to read.
>>>
>>> Also, is there a single-page or pdf version of this material?
>>>
>> Mark,
>> Sorry about the yellow I hadn't noticed it. I am trying to fix it,  
>> but
>> it seems to be defeating my very limited css skills. The css  
>> generated
>> by org is:
>>
>> <pre class="src src-emacs-shell">
>> *~
>> </pre>
>>
>> <pre class="src src-emacs-shell">
>> bzr add *.org
>> </pre>
>>
>> In my stylesheet I am trying things like:
>>
>> pre.src {
>> 	font-style: bold;
>> 	color: black;
>> 	
>> }
>>
>> span.src-emacs-shell {color: black;}
>>
>> However, I can't get the span (which should affect the quoted text)  
>> to
>> work. I would appreciate it if someone could point me in the righ
>> direction.
>>
>> Once I have sorted this I will generate a PDF version.
>
> The span has a hardcoded style element which specifies the colour
>
> <span style="color: rgb(255, 255, 85);">"Imported sources."</span>
>
> I don't think you will be able to override that with CSS.  You need to
> somehow remove the embedded style from the exported source.

I think this is related to the value of org-export-htmlize-output-type.
It should be `inline-css' or `css', seems to me that you have set it  
to `font'.

- Carsten



>
>
> -Bernt
>
>
> _______________________________________________
> 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

Re: Re: Article: Synchronizing org Files Using bzr and git

[Sebastian Rose]

Bernt Hansen <bernt@norang.ca> writes:
>> Mark,
>> Sorry about the yellow I hadn't noticed it. I am trying to fix it, but
>> it seems to be defeating my very limited css skills. The css generated
>> by org is:
>>
>> <pre class="src src-emacs-shell">
>> *~
>> </pre>
>>
>> <pre class="src src-emacs-shell">
>> bzr add *.org
>> </pre>
>>
>> In my stylesheet I am trying things like:
>>
>> pre.src {
>> 	font-style: bold;
>> 	color: black;
>> 	
>> }
>>
>> span.src-emacs-shell {color: black;}
>>
>> However, I can't get the span (which should affect the quoted text) to
>> work. I would appreciate it if someone could point me in the righ
>> direction.
>>
>> Once I have sorted this I will generate a PDF version.
>
> The span has a hardcoded style element which specifies the colour
>
> <span style="color: rgb(255, 255, 85);">"Imported sources."</span>
>
> I don't think you will be able to override that with CSS.  You need to
> somehow remove the embedded style from the exported source.


M-x customize-variable RET htmlize-output-type

and set it to `css' or `inline-css'.

Your setting is `font'

Best,

-- 
Sebastian Rose, EMMA STIL - mediendesign, Niemeyerstr.6, 30449 Hannover
Tel.:  +49 (0)511 - 36 58 472
Fax:   +49 (0)1805 - 233633 - 11044
mobil: +49 (0)173 - 83 93 417
Http:  www.emma-stil.de

Re: Re: Article: Synchronizing org Files Using bzr and git

[Ian Barton]

Sebastian Rose wrote:
> Bernt Hansen <bernt@norang.ca> writes:
>>> Mark,
>>> Sorry about the yellow I hadn't noticed it. I am trying to fix it, but
>>> it seems to be defeating my very limited css skills. The css generated
>>> by org is:
>>>
>>> <pre class="src src-emacs-shell">
>>> *~
>>> </pre>
>>>
>>> <pre class="src src-emacs-shell">
>>> bzr add *.org
>>> </pre>
>>>
>>> In my stylesheet I am trying things like:
>>>
>>> pre.src {
>>> 	font-style: bold;
>>> 	color: black;
>>> 	
>>> }
>>>
>>> span.src-emacs-shell {color: black;}
>>>
>>> However, I can't get the span (which should affect the quoted text) to
>>> work. I would appreciate it if someone could point me in the righ
>>> direction.
>>>
>>> Once I have sorted this I will generate a PDF version.
>> The span has a hardcoded style element which specifies the colour
>>
>> <span style="color: rgb(255, 255, 85);">"Imported sources."</span>
>>
>> I don't think you will be able to override that with CSS.  You need to
>> somehow remove the embedded style from the exported source.
> 
> 
> M-x customize-variable RET htmlize-output-type
> 
> and set it to `css' or `inline-css'.
> 
> Your setting is `font'
> 
Thanks Sebastien - my setting was already inline-css. I tried switching 
to css and that has fixed the problem.

Ian.

Re: Article: Synchronizing org Files Using bzr and git

[Ian Barton]

> First of all, I do not control in any way what gets on Worg.
> Bastien set up Worg as user-edited content, and this is what
> it should be.
> 
> If you aks my opinion, I think your tutorial is *exactly* what
> Worg was made for!  I have not studied it in detail, but
> it looks useful, addresses a subject that has almost become
> a FAQ.  And if it is up on Worg, bugs will be fixed
> and improvements made.
> 
> So please feel free to add your tutorial to Worg.
> The best place would be the org-tutorial directory, and
> you should then make a link from the index.org in that
> same directory.  After pushing, it will take 1.5 hours or
> less to appear on the web.
> 
OK, it's now on Worg.

Ian.

Re: Article: Synchronizing org Files Using bzr and git

[Carsten Dominik]

On Mar 6, 2009, at 11:33 AM, Ian Barton wrote:

>> First of all, I do not control in any way what gets on Worg.
>> Bastien set up Worg as user-edited content, and this is what
>> it should be.
>> If you aks my opinion, I think your tutorial is *exactly* what
>> Worg was made for!  I have not studied it in detail, but
>> it looks useful, addresses a subject that has almost become
>> a FAQ.  And if it is up on Worg, bugs will be fixed
>> and improvements made.
>> So please feel free to add your tutorial to Worg.
>> The best place would be the org-tutorial directory, and
>> you should then make a link from the index.org in that
>> same directory.  After pushing, it will take 1.5 hours or
>> less to appear on the web.
> OK, it's now on Worg.

Great work, thanks!

- Carsten

Re: Article: Synchronizing org Files Using bzr and git

[Yuval Hager]

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

On Friday 06 March 2009, Ian Barton wrote:
> > First of all, I do not control in any way what gets on Worg.
> > Bastien set up Worg as user-edited content, and this is what
> > it should be.
> >
> > If you aks my opinion, I think your tutorial is *exactly* what
> > Worg was made for!  I have not studied it in detail, but
> > it looks useful, addresses a subject that has almost become
> > a FAQ.  And if it is up on Worg, bugs will be fixed
> > and improvements made.
> >
> > So please feel free to add your tutorial to Worg.
> > The best place would be the org-tutorial directory, and
> > you should then make a link from the index.org in that
> > same directory.  After pushing, it will take 1.5 hours or
> > less to appear on the web.
>
> OK, it's now on Worg.
>

I can't find it (I'm rather new to all this).

One thing that confused me is that I tried to work with two machines, 
without a server. Figuring git is distributed, I thought I do not need a 
server, and I tried to follow the tutorial. Obviously, I got hit when I 
performed a 'git push' onto a non-bare repository (now I know what these 
things mean ;).
I now know not to use 'push' and can get along fine with just 'pull'-ing. I 
think the tutorial might be better if you either mention how to work 
without a server, or just put a big note not to push onto a non-server 
branch (There is a note there, but it was probably not big enough for me ;)

Thanks for a great tutorial. You made me cross the git barrier. Once I'm on 
the other side, nothing would take me back (same way I felt about org-mode 
after seeing Russell Adams' video).

-- 
yuval

[-- Attachment #1.2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 197 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

Re: Re: Article: Synchronizing org Files Using bzr and git

[Ian Barton]

> One thing that confused me is that I tried to work with two machines, 
> without a server. Figuring git is distributed, I thought I do not need a 
> server, and I tried to follow the tutorial. Obviously, I got hit when I 
> performed a 'git push' onto a non-bare repository (now I know what these 
> things mean ;).
> I now know not to use 'push' and can get along fine with just 'pull'-ing. I 
> think the tutorial might be better if you either mention how to work 
> without a server, or just put a big note not to push onto a non-server 
> branch (There is a note there, but it was probably not big enough for me ;)
> 
> Thanks for a great tutorial. You made me cross the git barrier. Once I'm on 
> the other side, nothing would take me back (same way I felt about org-mode 
> after seeing Russell Adams' video).

Yuval,

Thanks for the comments. I want to improve the git section. One thing 
that's easy with bzr is to just push your changes to a remote server, or 
a usb stick in one operation, even if the remote repo doesn't exist.

Using git this seems to be problematic. You can't use push unless there 
is a repo already there. You can create a blank repo ready to push into, 
but for the lazy this requires two steps instead on one. It is supposed 
to be possible to use git clone to create the repo and populate in a 
single step. However, I seem to fall into a syntactic black hole here 
and just end up creating a new repo locally.

Ian.

Re: Re: Article: Synchronizing org Files Using bzr and git

[Alan E. Davis]

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

Before Ian posted his document, I had started to condense the suggestions I
had received from an earlier query into a HOWTO of sorts.   I cannot sit
down with this right now, but for your interest, maybe this outline will
help?

One important issue for me on a GNU/Linux (Ubuntu) box has been
permissions.   Either I have had to give completely permissive permissions
to both users on both machines, to the org.git repo on the USB stick, or
ensure that both users have the same UID number and GID numbers on both
machines.  My stick is a linux, ext3, partition.

Since I started using a bare repo on the stick, all has been well.  MUch
better.

A PDF is attached.

Alan


-- 
Alan Davis

"An inviscid theory of flow renders the screw useless, but the need for one
non-existent."                     ---Lord Raleigh (John William Strutt), or
else his son, who was also a scientist.

It is undesirable to believe a proposition when
there is no ground whatsoever for supposing it is true.
    ---- Bertrand Russell

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

[-- Attachment #2: GitBareRepo.pdf --]
[-- Type: application/pdf, Size: 43306 bytes --]

[-- Attachment #3: 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