From: "Sebastien Vauban" <wxhgmqzgwmuf-geNee64TY+gS+FvcfC7Uqw@public.gmane.org>
To: emacs-orgmode-mXXj517/zsQ@public.gmane.org
Subject: Re: [PATCH] Re: Can't make org-install.el
Date: Sat, 19 May 2012 21:00:25 +0200 [thread overview]
Message-ID: <804nrcq9me.fsf@somewhere.org> (raw)
In-Reply-To: 871umghwrp.fsf@gnu.org
Hi Achim,
Bastien wrote:
> Achim Gratz <Stromeko-i47jiTeKxPI@public.gmane.org> writes:
>
>> While I still don't understand how this is happening exactly, I've
>> re-written the functions in question to work off temporary buffers, which
>> only runs into the problem of non-writability at the very end when the file
>> is to be saved and should then ask for confirmation. At that point it
>> should be possible to see what is going on.
>
> Applied, thanks.
OK, so git pull:
--8<---------------cut here---------------start------------->8---
Seb@MEDIACENTER:home/org-mode 0$ git pull
From git://orgmode.org/org-mode
40a789e..7b33d9f master -> origin/master
Updating 40a789e..7b33d9f
error: Your local changes to the following files would be overwritten by merge:
UTILITIES/org-fixup.el
Please, commit your changes or stash them before you can merge.
Aborting
--8<---------------cut here---------------end--------------->8---
Surprise... I hadn't touched (of course) org-fixup.el in any way, except by
changing the permissions (to 0777).
OK. Just do what git says: stash the changes.
--8<---------------cut here---------------start------------->8---
Seb@MEDIACENTER:home/org-mode 0$ git stash
Saved working directory and index state WIP on master: 40a789e fix org-reload and add parameters to customize output from org-version
Checking out files: 100% (257/257), done.
HEAD is now at 40a789e fix org-reload and add parameters to customize output from org-version
Seb@MEDIACENTER:home/org-mode 0$ git pull
Updating 40a789e..7b33d9f
Fast-forward
UTILITIES/org-fixup.el | 64 +++++++++++++++++++++++++++++++++--------------
1 files changed, 45 insertions(+), 19 deletions(-)
--8<---------------cut here---------------end--------------->8---
Now, let's see...
--8<---------------cut here---------------start------------->8---
Seb@MEDIACENTER:home/org-mode 0$ make autoloads
make -C lisp autoloads
make[1]: Entering directory `/cygdrive/c/home/org-mode/lisp'
rm -f org-version.el org-install.el org-version.elc org-install.elc
org-version: 7.8.10 (release_7.8.10-573-g7b33d9)
Loading c:/home/org-mode/lisp/org-compat.el (source)...
Loading c:/home/org-mode/UTILITIES/org-fixup.el (source)...
Saving file c:/home/org-mode/lisp/org-version.el...
Loading vc-git...
Wrote c:/home/org-mode/lisp/org-version.el
org-install: 7.8.10 (release_7.8.10-573-g7b33d9)
Loading c:/home/org-mode/lisp/org-compat.el (source)...
Loading c:/home/org-mode/UTILITIES/org-fixup.el (source)...
Saving file c:/cygdrive/c/home/org-mode/lisp/org-install.el...
c:/cygdrive/c/home/org-mode/lisp/: no such directory
Makefile:30: recipe for target `org-install.el' failed
make[1]: *** [org-install.el] Error 127
make[1]: Leaving directory `/cygdrive/c/home/org-mode/lisp'
targets.mk:87: recipe for target `autoloads' failed
make: *** [autoloads] Error 2
Seb@MEDIACENTER:home/org-mode 0$ ls
Makefile README_DIST README_maintainer contrib doc lisp request-assign-future.txt testing
README README_GIT UTILITIES default.mk etc local.mk targets.mk
Seb@MEDIACENTER:home/org-mode 0$
--8<---------------cut here---------------end--------------->8---
Error (lisp directory) not there!?? But the reason comes clearly to the
surface: a mix of Cygwin and Win32 syntax for the pathnames.
C:/home/org-mode/lisp/ and
/cygdrive/c/home/org-mode/lisp/
becomes here c:/cygdrive/c/home/org-mode/lisp/...
Maybe you can understand from where that could come.
Anyway, let me already thank you a lot for your help on this. I appreciate it
a lot; thanks...
Best regards,
Seb
[1] DEFINITION NOT FOUND: 1
--
Sebastien Vauban
next prev parent reply other threads:[~2012-05-19 19:00 UTC|newest]
Thread overview: 16+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-05-18 20:49 Can't make org-install.el Sebastien Vauban
2012-05-19 8:54 ` Achim Gratz
2012-05-19 10:42 ` Sebastien Vauban
2012-05-19 12:00 ` Achim Gratz
2012-05-19 13:40 ` Sebastien Vauban
2012-05-19 15:11 ` Achim Gratz
2012-05-19 17:56 ` [PATCH] " Achim Gratz
2012-05-19 18:05 ` Bastien
2012-05-19 19:00 ` Sebastien Vauban [this message]
2012-05-19 19:17 ` Achim Gratz
2012-05-19 19:41 ` Achim Gratz
2012-05-19 20:27 ` Achim Gratz
2012-05-21 8:37 ` Sebastien Vauban
2012-05-21 8:59 ` Sebastien Vauban
2012-05-23 22:01 ` Achim Gratz
2012-05-21 13:34 ` Bastien
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: https://www.orgmode.org/
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=804nrcq9me.fsf@somewhere.org \
--to=wxhgmqzgwmuf-genee64ty+gs+fvcfc7uqw@public.gmane.org \
--cc=emacs-orgmode-mXXj517/zsQ@public.gmane.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
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).