Actually this is better. Reverse diff which I suggested won't work. Bill.
2009/2/9 Gonzalo Tornaria <torna...@gmail.com>: > > In order to revert trunk to revision 1593, you actually need to do a > "reverse merge" of all the changes between r1593 and HEAD. > > See: > http://svnbook.red-bean.com/en/1.2/svn.branchmerge.commonuses.html#svn.branchmerge.commonuses.undo > > I guess something like: > > svn merge -r HEAD:1593 . > > should work... (you may need to replace "." by the full URL of trunk > if you are not using svn 1.5). > > I would suggest doing a separate commit just for the revert, and put > the autostuff update in a different commit, but that's just a matter > of taste... > > Gonzalo > > > > On Mon, Feb 9, 2009 at 7:32 PM, <ja...@njkfrudils.plus.com> wrote: >> >> On Monday 09 February 2009 21:47:44 Bill Hart wrote: >>> If we can: >>> >>> 1) revert ****trunk**** to revision 1593 >>> 2) copy trunk/AUTHORS to trunk/build.vc9/gnu.license/AUTHORS >>> 3) copy trunk/README to trunk/build.vc9/gnu.license/README >>> 4) run autoconf >>> 5) run automake >>> 6) commit >>> >>> I think everything should work. If you can do this it would be great. >>> >>> Bill. >> >> mkdir mpirtest >> cd mpirtest >> svn checkout -r 1593 http://modular.math.jmu.edu/svn/mpir >> cd mpir/mpir/trunk >> cp AUTHORS build.vc9/gnu.license/AUTHORS >> cp README build.vc9/gnu.license/README >> autoconf >> automake >> svn commit -m "revert to r1593 and try autostuff again" >> >> Sending trunk/Makefile.in >> svn: Commit failed (details follow): >> svn: Your file or directory 'Makefile.in' is probably out-of-date >> svn: The version resource does not correspond to the resource within the >> transaction. Either the requested version resource is out of date (needs to >> be updated), or the requested version resource is newer than the transaction >> root (restart the commit). >> >> I think I need to revert mpir rather than do the above , any ideas? >> >> >> >> >>> >>> 2009/2/9 <ja...@njkfrudils.plus.com>: >>> > On Monday 09 February 2009 16:25:23 Bill Hart wrote: >>> >> This is bizarre. Revision 1591 passes on bsd. But the head (revision >>> >> 1599) does not. >>> >> >>> >> The only changes made between these two were: >>> >> >>> >> 1) Updating the authors file, changing some bug reporting addresses in >>> >> some text, etc. >>> >> >>> >> 2) Removing some ANSI2KNR stuff from the autotools files as this is >>> >> not supported by the latest autotools. >>> >> >>> >> 3) Running aclocal, automake and autoconf again. >>> >> >>> >> None of this should affect it, but it does. >>> >> >>> >> At any rate, we can revert it and just put the changes to the text >>> >> files back in. The *only* reason I changed the ANSI2KNR stuff was that >>> >> one needs to rerun automake after changing the bug reporting address >>> >> in the Makefile.am so that make install doesn't tell you to report >>> >> bugs to Torbjorn. Basically I cannot run automake on sage.math because >>> >> the latest autotools is on there and MPIR breaks it (due to this >>> >> ANSI2KNR stuff). >>> >> >>> >> So I guess the good news is that if we get someone else to run >>> >> autoconf and automake, we should be ok. I can't even guess at what >>> >> brilliant feature of the new autotools breaks the test code on certain >>> >> versions of Apple's compiler. >>> >> >>> >> Bill. >>> > >>> > I just ran autostuff on rev1599 and a lot of changes appeared , it looks >>> > like its not been run , anyway >>> > I can do it , exactly which version r???? and do I do a revert or what? >>> > >>> > Jason >>> >>> >> >> >> > >> > > > > --~--~---------~--~----~------------~-------~--~----~ You received this message because you are subscribed to the Google Groups "mpir-devel" group. To post to this group, send email to mpir-devel@googlegroups.com To unsubscribe from this group, send email to mpir-devel+unsubscr...@googlegroups.com For more options, visit this group at http://groups.google.com/group/mpir-devel?hl=en -~----------~----~----~----~------~----~------~--~---
