From mboxrd@z Thu Jan 1 00:00:00 1970 From: Nathan DeGruchy Subject: Re: Problem updating Org Date: Thu, 2 Jan 2014 14:01:13 -0500 Message-ID: <7F8CAED7-7A34-4F80-A821-55E462937669@degruchy.org> References: <52C5B614.2050609@verizon.net> Mime-Version: 1.0 (1.0) Content-Type: multipart/alternative; boundary=Apple-Mail-3541C917-6C06-4BBA-8677-5658C8019A54 Content-Transfer-Encoding: 7bit Return-path: Received: from eggs.gnu.org ([2001:4830:134:3::10]:58534) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VynWI-0002ax-QF for emacs-orgmode@gnu.org; Thu, 02 Jan 2014 14:01:31 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1VynWC-0005gZ-GX for emacs-orgmode@gnu.org; Thu, 02 Jan 2014 14:01:26 -0500 Received: from out3-smtp.messagingengine.com ([66.111.4.27]:44113) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1VynWC-0005gS-D6 for emacs-orgmode@gnu.org; Thu, 02 Jan 2014 14:01:20 -0500 Received: from compute2.internal (compute2.nyi.mail.srv.osa [10.202.2.42]) by gateway1.nyi.mail.srv.osa (Postfix) with ESMTP id EECB1202B7 for ; Thu, 2 Jan 2014 14:01:15 -0500 (EST) Received: from [10.6.20.25] (unknown [173.227.98.2]) by mail.messagingengine.com (Postfix) with ESMTPA id A6A89C00E84 for ; Thu, 2 Jan 2014 14:01:15 -0500 (EST) In-Reply-To: <52C5B614.2050609@verizon.net> List-Id: "General discussions about Org-mode." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org Sender: emacs-orgmode-bounces+geo-emacs-orgmode=m.gmane.org@gnu.org To: "emacs-orgmode@gnu.org" --Apple-Mail-3541C917-6C06-4BBA-8677-5658C8019A54 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: quoted-printable Try checking out the version already in HEAD: git checkout -- lisp/ox-html.e= l Then pull again.=20 Nathan DeGruchy nathan@degruchy.org > On Jan 2, 2014, at 1:55 PM, Charles Millar wrote: >=20 > I update org daily (at least I try to) using make-update2 in Cygwin git. > Today I received the following message >=20 > - - - - 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-forwar= ded. > git remote update > Fetching origin > =46rom 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 m= erge: > 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 - - - - >=20 > I have not opened ox-html.el and I do not export to html. (I do export to L= aTeX.) >=20 > 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/o= wner/.elisp/org-mode/lisp/) >=20 > Charlie Millar >=20 > --- > This email is free from viruses and malware because avast! Antivirus prote= ction is active. > http://www.avast.com >=20 >=20 --Apple-Mail-3541C917-6C06-4BBA-8677-5658C8019A54 Content-Type: text/html; charset=utf-8 Content-Transfer-Encoding: quoted-printable
Try checking out the version already i= n HEAD: git checkout -- lisp/ox-html.el

Then pull a= gain. 

Nathan DeGruchy

On Jan 2, 2014, at 1:55= PM, Charles Millar <millarc@veriz= on.net> wrote:

I up= date org daily (at least I try to) using make-update2 in Cygwin git.<= br>Today I received the following message

<= span>- - - - begin message - - - -
rm -f
git= checkout
D    contrib/lisp/ob-groovy.el
M    contrib/lisp/ob-oz.el
M &nbs= p;  contrib/lisp/org-mac-link.el
M   &nb= sp;lisp/ob-C.el
D    lisp/ob-J.el
<= span>M    lisp/ob-latex.el
M   &nbs= p;lisp/ob-maxima.el
M    lisp/org-agenda.el
M    lisp/org-element.el
M &nb= sp;  lisp/org-habit.el
M    lisp/or= g-inlinetask.el
M    lisp/org-table.el=
M    lisp/org.el
M   &nbs= p;lisp/ox-html.el
M    lisp/ox-latex.el
M    lisp/ox-texinfo.el
M  &n= bsp; lisp/ox.el
M    testing/lisp/test-o= b.el
M    testing/lisp/test-ox.el
<= span>Your branch is behind 'origin/master' by 6 commits, and can be fast-for= warded.
git remote update
Fetching origin
=46rom git://orgmode.org/org-mode
  = ;13bb116..6e51188  master     -> origin/master
  1a3591c..03ce57e  maint    &= nbsp; -> origin/maint
git pull
error= : Your local changes to the following files would be overwritten by merge:
   lisp/ox-html.el
Please, co= mmit your changes or stash them before you can merge.
Aborti= ng
Updating e23bbda..6e51188
mk/targets.mk:1= 11: 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 La= TeX.)

GNU Emacs 24.3.1 (i386-mingw-nt6.0.60= 02) 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


=
= --Apple-Mail-3541C917-6C06-4BBA-8677-5658C8019A54--