Re: sync auctex mercurial
- First Post
- Replies
- Stats
-
Go to
- ----- 2024 -----
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2005 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2004 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2003 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2002 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2001 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2000 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 1999 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 1998 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
>>>> Uwe Brauer <oub(a)mat.ucm.es> writes:
I think I have succeeded here comes the patch
# HG changeset patch
[...]
I could apply the patch fine with just some rejects:
./Makefile.rej (Version number missmatch)
./preview/prv-emacs.el.rej (deleted!?)
./ChangeLog.auctex.rej (Some changes in respect to upstream.)
The good news is that building the package works fine. Now what? How
do I test this? Do you have some easy test descriptions that I can
follow?
Yours
--
%% Mats
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
> "Mats" == Mats Lidell <matsl(a)xemacs.org> writes:
>>>>> Uwe Brauer <oub(a)mat.ucm.es> writes:
> I think I have succeeded here comes the patch
> # HG changeset patch
[...]
I could apply the patch fine with just some rejects:
./Makefile.rej (Version number missmatch)
./preview/prv-emacs.el.rej (deleted!?)
./ChangeLog.auctex.rej (Some changes in respect to upstream.)
This is not good. The new Makefile is essential since I had to add and
remove files. Prv-emacs.el I removed
hg remove prv-emacs.el
So what is the reason for this behavior? I obtained the auctex directory
via hg a week ago? Somebody worked on it? I thought hg could deal with
it.
How shall we proceed? Merge? Shall I download again auctex and then
repeat my changes??
The good news is that building the package works fine. Now what? How
do I test this? Do you have some easy test descriptions that I can
follow?
Without the correct Makefile you will only compile and generate a
bindist tarball which contains part of the actual release. This is not
good, my patch should be working 100% so we should resolve this first.
Uwe
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
Tuesday, 9 December
Tue, 9 Dec
11:55 a.m.
New subject: sync auctex mercurial
>>>> Uwe Brauer <oub(a)mat.ucm.es> writes:
This is not good. The new Makefile is essential since I had to add
and
remove files. [...]
I was a bit optimistic. When looking at the contents of the patch it
does only contain these three files. So something with your commit
must have gone wrong. Have you committed all changes? Maybe multiple
commits? You need to export all commits you have done locally.
So what is the reason for this behavior? I obtained the auctex
directory via hg a week ago? Somebody worked on it? I thought hg
could deal with it.
I'm sure it can. My Makefile contains the string:
VERSION = 1.54
The patch contains:
-VERSION = 11.88-a
+VERSION = 1.55
So somehow the 11.88-a experiment(!?) got mixed into your files.
How shall we proceed? Merge? Shall I download again auctex and then
repeat my changes??
I suggest you make a clean workspace from our packages and then put
the new version of auctex on top of that.
Take special precautions when it comes to ChangeLog.auctex which seems
to have been updated by us and can thus cause conflicts when a new
upstream version is just put on top of it.
Without the correct Makefile you will only compile and generate a
bindist tarball which contains part of the actual release. This is not
good, my patch should be working 100% so we should resolve this first.
Yes, as it seems I did not get any new elisp files so I was just
building the old files. Sorry for that.
Yours
--
%% Mats
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
Wednesday, 10 December
Wed, 10 Dec
2:29 a.m.
New subject: sync auctex mercurial
Mats Lidell writes:
>>>>> Uwe Brauer <oub(a)mat.ucm.es> writes:
> This is not good. The new Makefile is essential since I had to add and
> remove files. [...]
I was a bit optimistic. When looking at the contents of the patch it
does only contain these three files. So something with your commit
must have gone wrong. Have you committed all changes? Maybe multiple
commits? You need to export all commits you have done locally.
"Only one of several commits" seems most likely, given the presence of
"11.88-a" in the patch.
Other possibilities to check are whether "hg add" has been performed
on the files (but he should use "hg status" to get a list of added and
removed files first, and make sure no junk like editor backups are in
the add list), or didn't use a bundle (I think "hg bundle" is
preferable to "hg export" here since both ends use hg).
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://lists.xemacs.org/mailman/listinfo/xemacs-beta
3635
days inactive
3636
days old
3 comments
3 participants
tags (0)
participants (3)
-
Stephen J. Turnbull -
The XEmacs Package Smoketest -
Uwe Brauer