Stephen J. Turnbull writes: 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. 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

Mats Lidell writes: The reason for doing anything in a branch is to avoid interrupting work on the mainline. This is a huge change and hoping that there are no problems is silly. This does not reflect on you or Uwe in the slightest. I wouldn't do this work in the mainline, nor would any of the other core developers. Look in the VM thread started by Giacomo Boffi for another reason why major upgrades should be done on a branch. Not if it stops the build, which this does. It's really not that hard to work in a CVS branch once you've set it up properly (for this kind of task). I did it for many months while releasing 21.4. If he's away for a few days, I'll move the broken stuff to the branch and restore the 1.48 release. _______________________________________________ XEmacs-Beta mailing list XEmacs-Beta(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta

Mats Lidell writes: Sure, but we already knew there was going to be a problem; large merges like this always bring lots of problems. This isn't a reflection on any individual developer, as I said. Emacs-devel is currently having similar problems due to the GNUstep/ Cocoa merge (which was also done by moving files from a separate workspace into the mainline workspace); it broke the Windows build and caused several regressions. The point is that doing it without the help of the version control system makes it less controllable. Better yes, but still not a good idea in my opinion. Look, Uwe got the job less than half done and took off on a trip. If it had been done on a branch, that wouldn't matter. I don't understand the objection to putting this on a branch. If Uwe had simply done cvs-rw checkout -r auctex-1_48 -d auctex-11_84-import auctex cd auctex-11_84-import cvs-rw tag -b auctex-11_84-import and done and committed the work there, at any time he could simply do cd ../auctex cvs-rw update -j auctex-1_48 -j auctex-11_84-import cvs-rw commit -m "Merge AUCTeX 11.84 improvements into mainline." and be done. There is no reason not to use CVS in this way, because he controls the mainline, too. And if he puts auctex-11_84-import in the list of packages to compile, he can do a make world, too. The only thing that won't work right is making individual packages because the mainline and branch auctex packages will overwrite each other. Months ago I recommended to Uwe that he do the work on a branch. Any experienced developer would recommend that, too. _______________________________________________ XEmacs-Beta mailing list XEmacs-Beta(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta

ClamAV 0.93 Mats Lidell writes: OK, since the smoketest is red across the board, and we don't know Uwe will be back in the game, I'm doing this. The "auctex-11_84-import" branch tag now contains the post submission version of 11.84, and the trunk is now reverted to XEmacs package release 1.48. Effectively I've swapped the branch and the trunk by doing cd .../xemacs-packages cvs checkout auctex cvs checkout -r auctex-11_84-import -d auctex-11_84-import auctex cd auctex cvs tag partial-import-11_84 cd ../auctex-11_84-import cvs update -dP -j auctex-1_48 -j partial-import-11_84 cvs commit cd ../auctex cvs update -dP -j partial-import-11_84 -j auctex-1_48 cvs commit This *should* turn the smoketests for 21.5 green, but the builds are still in progress. I'll check tomorrow, I need to get some sleep now. Steve _______________________________________________ XEmacs-Beta mailing list XEmacs-Beta(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta

Stephen J. Turnbull wrote: Hi Stephen, I am sorry to have caused trouble, especially before leaving for a week. Thanks, I had problems with submitting to the branch and then after I seemed that no patch for XEmacs.rules was needed I just submitted it to the main CVS. I will start working on this on monday. Uwe _______________________________________________ XEmacs-Beta mailing list XEmacs-Beta(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta

Uwe Brauer writes: It's not really a big deal, as long as it only happens once in your career. I understand you had issues with CVS. Just live and learn from it, that "issues" with infrastructure almost never justify varying from best practices. _______________________________________________ XEmacs-Beta mailing list XEmacs-Beta(a)xemacs.org http://calypso.tux.org/cgi-bin/mailman/listinfo/xemacs-beta