From: <dan...@ya...> - 2001-06-26 02:29:02
|
Help please. I've just committed a change to w32api CVS for winbase.h but screwed up royally. I need help to fix up my mistake. Unintentionally, the commit also applied changes to runtime/include files malloc.h, float.h and math.h. How do I reverse these changes. They are not harmful, but (1) the message attached to them is inappropriate (refers to w32apu/include/base) and (2) the changes to float.h and math.h are similar to the ones that Mumit recently proposed to get GCC-3.0 libstdc++ up to build, but his are, uhm, more professional. The change to malloc.h is trivial, but still the message is inappropriate. How do I undo the changes, with least mess. As you can tell from this, I do not have much experience with CVS, apart from the anonymous sort. Maybe you should rescind my priveleges there until I have more time in the sandpit. Danny _____________________________________________________________________________ http://messenger.yahoo.com.au - Yahoo! Messenger - Voice chat, mail alerts, stock quotes and favourite news and lots more! |
From: Mumit K. <khan@NanoTech.Wisc.EDU> - 2001-06-26 04:46:48
|
On Tue, 26 Jun 2001, Danny Smith wrote: > Help please. > > I've just committed a change to w32api CVS for winbase.h but screwed up > royally. I need help to fix up my mistake. > > Unintentionally, the commit also applied changes to runtime/include > files malloc.h, float.h and math.h. How do I reverse these changes. > They are not harmful, but (1) the message attached to them is > inappropriate (refers to w32apu/include/base) and (2) the changes to > float.h and math.h are similar to the ones that Mumit recently proposed > to get GCC-3.0 libstdc++ up to build, but his are, uhm, more > professional. The change to malloc.h is trivial, but still the message > is inappropriate. Just back out of the changes (create a diff, and patch reverse it), and recommit. Or, you can check out the previous version (with cvs co -r <revision>), reset the sticky tag (with cvs update -A), and commit it. No scratches, and not a big deal; just feels like it the first time. Regards, Mumit |
From: Mumit K. <khan@NanoTech.Wisc.EDU> - 2001-06-26 06:22:57
|
On Tue, 26 Jun 2001, Danny Smith wrote: > Help please. > > I've just committed a change to w32api CVS for winbase.h but screwed up > royally. I need help to fix up my mistake. Danny, I forgot another common method -- back out of patches by merging the right revisions. 1. find the two revisions where the change is made. Chances are that it's going to be the latest and the previous one in this case. $ cvs status -v file1 will show the various revisions for file1. If you're unsure which revisions, use ``cvs log'' and take a look at the log entry. I always log the ChangeLog in each change, so it's easy in my case. Let's say the current revision is 1.15 and previous revision was 1.14. $ cvs update -j 1.15 -j 1.14 file1 ^^ new ^^ old will "merge backwards", and remove the changes made between 1.14 and 1.15, and now you can just commit it. Regards, Mumit |
From: <dan...@ya...> - 2001-06-26 21:12:39
|
--- Mumit Khan <khan@NanoTech.Wisc.EDU> wrote: > On Tue, 26 Jun 2001, Danny Smith wrote: > > > Help please. > > > > I've just committed a change to w32api CVS for winbase.h but > screwed up > > royally. I need help to fix up my mistake. > > Danny, I forgot another common method -- back out of patches by > merging > the right revisions. > > 1. find the two revisions where the change is made. Chances are that > it's > going to be the latest and the previous one in this case. > > $ cvs status -v file1 > > will show the various revisions for file1. If you're unsure which > revisions, use ``cvs log'' and take a look at the log entry. I always > log the ChangeLog in each change, so it's easy in my case. > > Let's say the current revision is 1.15 and previous revision was > 1.14. > > $ cvs update -j 1.15 -j 1.14 file1 > ^^ new ^^ old > > will "merge backwards", and remove the changes made between 1.14 and > 1.15, > and now you can just commit it. > > Regards, > Mumit > Thanks, Mumit. After the silly panic, I effectively did what you suggest above, and it looks all right now. Mumit, I have always been appreciative of the way you can answer my naive questions without making me feel stupid. I think we all need to practice that skill/attitude more. I look back at my first posts to the mingw list, not that long ago, and I feel that if my posts had been met by "clever" replies rather than helpful ones, I would not be here today. Thanks for all your help. Danny _____________________________________________________________________________ http://messenger.yahoo.com.au - Yahoo! Messenger - Voice chat, mail alerts, stock quotes and favourite news and lots more! |