Re: get ready to wipe out your subversion/apr/ directory again

> I'm going to have to reimport all of subversion/apr/ again; I'll let
> you know when it's ready for update.

For the record, there are better ways to recover from accidental or
no-longer-needed mainline commits of imported sources than nuking the
repository directory and re-importing:

        1. If you simply check in a copy on the mainline which is
           identical to the current vendor branch version, the file
           will be tagged as a conflict on each subsequent import but
           the "merge" will be trivial.

        2. If you do (1) and also reset the default branch of the file
           to the vendor branch ("cvs admin -bVENDOR FILE"),
           the file will no longer be flagged as a conflict on
           subsequent imports. Historical checkouts by date will no
           longer be correct, though.

        3. If neither (1) or (2) seems adequate, you could use "cvs
           admin -o1.2 FILE" and "cvs admin -bVENDOR FILE" to simply
           undo the damage. This will still eit that part of people's
           working directories, but it at least won't destroy all of
           the vendor branch history.

Apologies if you guys knew all this. Of course, for a project in its
early stages, it doesn't matter much anyway. Perhaps you had another
reason to redo the imports.

(Hopefully subversion will do a better job of handling locally
modified imported files which don't need to be locally modified any
more.)
Received on Sat Oct 21 14:36:05 2006