[Top][All Lists]

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

Re: Rollback commits ???

From: Paul Sander
Subject: Re: Rollback commits ???
Date: Sat, 24 Aug 2002 10:07:59 -0700

I can think of a couple of approaches.  The first is to touch all of the
files immediately after they're extracted from the archive, using a command
such as:

        gzip -cd archive.tgz | tar tf - | xargs touch

Another way is to recall that a three-way merge is the act of applying a
difference between one file and a second file to a third file.  If
the one file is your current bad version, the second file is your last
good version, and the third file is your current bad version, then the
result of the merge is to undo the last few commits.  The "cvs update"
command performs three-way merges if you give it two -j options.  For
convenience, You'll probably want to apply a label to your last good
versions before starting this exercise, if it's not already done.

You'll probably want to dircmp the result of the merge with a known good
copy to make sure it was done right.

>--- Forwarded mail from address@hidden

>OK, I erroneously committed a tree that included files that should not
>be in repository.

>I tried to extract the correct files from a tgz archive onto the
>offending files, then commit; but, on checkout, the bad files are
>checked out.

>Is this because the file dates for the good (old) files are older than
>file dates on bad files?

>Well, long story short, I tried various unsuccessful methods and now am
>several commits into garbage ;<

>How can I roll back these last several commits?

>How can I clean up this mess?

>--- End of forwarded message from address@hidden

reply via email to

[Prev in Thread] Current Thread [Next in Thread]