* Problem updating Org
@ 2014-01-02 18:55 Charles Millar
2014-01-02 19:01 ` Nathan DeGruchy
0 siblings, 1 reply; 3+ messages in thread
From: Charles Millar @ 2014-01-02 18:55 UTC (permalink / raw)
To: emacs-orgmode
I update org daily (at least I try to) using make-update2 in Cygwin git.
Today I received the following message
- - - - begin message - - - -
rm -f
git checkout
D contrib/lisp/ob-groovy.el
M contrib/lisp/ob-oz.el
M contrib/lisp/org-mac-link.el
M lisp/ob-C.el
D lisp/ob-J.el
M lisp/ob-latex.el
M lisp/ob-maxima.el
M lisp/org-agenda.el
M lisp/org-element.el
M lisp/org-habit.el
M lisp/org-inlinetask.el
M lisp/org-table.el
M lisp/org.el
M lisp/ox-html.el
M lisp/ox-latex.el
M lisp/ox-texinfo.el
M lisp/ox.el
M testing/lisp/test-ob.el
M testing/lisp/test-ox.el
Your branch is behind 'origin/master' by 6 commits, and can be
fast-forwarded.
git remote update
Fetching origin
From git://orgmode.org/org-mode
13bb116..6e51188 master -> origin/master
1a3591c..03ce57e maint -> origin/maint
git pull
error: Your local changes to the following files would be overwritten by
merge:
lisp/ox-html.el
Please, commit your changes or stash them before you can merge.
Aborting
Updating e23bbda..6e51188
mk/targets.mk:111: recipe for target 'up0' failed
make: *** [up0] Error 1
- - - - end message - - - -
I have not opened ox-html.el and I do not export to html. (I do export
to LaTeX.)
GNU Emacs 24.3.1 (i386-mingw-nt6.0.6002) of 2013-03-17 on MARVIN
Org-mode version 8.2.4 (release_8.2.4-357-gda05ab.dirty @
c:/cygwin/home/owner/.elisp/org-mode/lisp/)
Charlie Millar
---
This email is free from viruses and malware because avast! Antivirus protection is active.
http://www.avast.com
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Problem updating Org
2014-01-02 18:55 Problem updating Org Charles Millar
@ 2014-01-02 19:01 ` Nathan DeGruchy
2014-01-07 12:41 ` Charles Millar
0 siblings, 1 reply; 3+ messages in thread
From: Nathan DeGruchy @ 2014-01-02 19:01 UTC (permalink / raw)
To: emacs-orgmode@gnu.org
[-- Attachment #1: Type: text/plain, Size: 1931 bytes --]
Try checking out the version already in HEAD: git checkout -- lisp/ox-html.el
Then pull again.
Nathan DeGruchy
nathan@degruchy.org
> On Jan 2, 2014, at 1:55 PM, Charles Millar <millarc@verizon.net> wrote:
>
> I update org daily (at least I try to) using make-update2 in Cygwin git.
> Today I received the following message
>
> - - - - begin message - - - -
> rm -f
> git checkout
> D contrib/lisp/ob-groovy.el
> M contrib/lisp/ob-oz.el
> M contrib/lisp/org-mac-link.el
> M lisp/ob-C.el
> D lisp/ob-J.el
> M lisp/ob-latex.el
> M lisp/ob-maxima.el
> M lisp/org-agenda.el
> M lisp/org-element.el
> M lisp/org-habit.el
> M lisp/org-inlinetask.el
> M lisp/org-table.el
> M lisp/org.el
> M lisp/ox-html.el
> M lisp/ox-latex.el
> M lisp/ox-texinfo.el
> M lisp/ox.el
> M testing/lisp/test-ob.el
> M testing/lisp/test-ox.el
> Your branch is behind 'origin/master' by 6 commits, and can be fast-forwarded.
> git remote update
> Fetching origin
> From git://orgmode.org/org-mode
> 13bb116..6e51188 master -> origin/master
> 1a3591c..03ce57e maint -> origin/maint
> git pull
> error: Your local changes to the following files would be overwritten by merge:
> lisp/ox-html.el
> Please, commit your changes or stash them before you can merge.
> Aborting
> Updating e23bbda..6e51188
> mk/targets.mk:111: recipe for target 'up0' failed
> make: *** [up0] Error 1
> - - - - end message - - - -
>
> I have not opened ox-html.el and I do not export to html. (I do export to LaTeX.)
>
> GNU Emacs 24.3.1 (i386-mingw-nt6.0.6002) of 2013-03-17 on MARVIN
> Org-mode version 8.2.4 (release_8.2.4-357-gda05ab.dirty @ c:/cygwin/home/owner/.elisp/org-mode/lisp/)
>
> Charlie Millar
>
> ---
> This email is free from viruses and malware because avast! Antivirus protection is active.
> http://www.avast.com
>
>
[-- Attachment #2: Type: text/html, Size: 3361 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
* Re: Problem updating Org
2014-01-02 19:01 ` Nathan DeGruchy
@ 2014-01-07 12:41 ` Charles Millar
0 siblings, 0 replies; 3+ messages in thread
From: Charles Millar @ 2014-01-07 12:41 UTC (permalink / raw)
To: emacs-orgmode
[-- Attachment #1: Type: text/plain, Size: 368 bytes --]
Thank you.
On 1/2/2014 2:01 PM, Nathan DeGruchy wrote:
> Try checking out the version already in HEAD: git checkout --
> lisp/ox-html.el
>
> Then pull again.
>
> *Nathan DeGruchy*
> nathan@degruchy.org <mailto:nathan@degruchy.org>
>
Charlie Millar
---
This email is free from viruses and malware because avast! Antivirus protection is active.
http://www.avast.com
[-- Attachment #2: Type: text/html, Size: 1509 bytes --]
^ permalink raw reply [flat|nested] 3+ messages in thread
end of thread, other threads:[~2014-01-07 12:41 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2014-01-02 18:55 Problem updating Org Charles Millar
2014-01-02 19:01 ` Nathan DeGruchy
2014-01-07 12:41 ` Charles Millar
Code repositories for project(s) associated with this public 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).