--- Mumit Khan <khan@...> 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
> the right revisions.
> 1. find the two revisions where the change is made. Chances are that
> 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
> $ cvs update -j 1.15 -j 1.14 file1
> ^^ new ^^ old
> will "merge backwards", and remove the changes made between 1.14 and
> and now you can just commit it.
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.
http://messenger.yahoo.com.au - Yahoo! Messenger
- Voice chat, mail alerts, stock quotes and favourite news and lots more!