Stephen J. Turnbull writes:
Uwe,
You committed to the mainline, which broke the packages build
completely. It's really important to do this kind of work on the
branch.
Please cd to your auctex mainline directory, and do
cvs-rw update -j -r auctex-1_48
This should be `cvs-rw update -j auctex-1_48' (no `-r'). However,
I've tested and it doesn't work; CVS doesn't update the files
according to the version requested, it only updates those present in
CVS/Entries.
You need to do something like
# get the two trees
cvs-rw checkout -A -d auctex auctex
cvs-rw checkout -r auctex-1_48 -d auctex-tmp auctex
# clean metadata
cd auctex-tmp
find . -name CVS -exec rm -rf '{}' ';'
# make manifests
find . -type f > ../NEW
cd ../auctex
find . -type f > ../OLD
cat ../NEW ../OLD | sort | uniq -d > ../SAME
cat ../SAME ../NEW | sort | uniq -u > ../ADD
cat ../SAME ../OLD | sort | uniq -u > ../DEL
# get rid of new files, leaving only CVS metadata
find . -name CVS -prune -type f -o -type f -exec rm -f '{}' ';'
# copy over the auctex-1.48 release files
cp -a ../auctex-tmp/* ./
# check that workspace contents look OK
# use cvs-rw diff | less, ls -R
# the following is where my recipe screwed up, CVS needs to be in the
# same directory as a file to add/remove it
for i in `grep -v CVS ../DEL`; do
pushd `dirname $i` >/dev/null 2>&1;
cvs-rw remove `basename $i`;
popd >/dev/null 2>&1;
done
for i in `grep -v CVS ../ADD`; do
pushd `dirname $i` >/dev/null 2>&1;
cvs-rw add `basename $i`;
popd >/dev/null 2>&1;
done
cvs status | less
cvs-rw commit
The above is tested except for actually doing the cvs add/remove/commit.
Then move the work to the auctex-11_84-import branch.
This still needs to be done on a branch.
_______________________________________________
XEmacs-Beta mailing list
XEmacs-Beta(a)xemacs.org
http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta