[svn.haxx.se] · SVN Dev · SVN Users · SVN Org · TSVN Dev · TSVN Users · Subclipse Dev · Subclipse Users · this month's index

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

From: Karl Fogel <kfogel_at_galois.collab.net>
Date: 2000-07-13 21:32:30 CEST

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

For future reference, lest there is any doubt:

    Please, *never* commit a change to any file inside
    subversion/apr/, except for README.svn.

The best way to keep a vendor branch in sync is to always upgrade it
by re-importing; especially given that we have commit access on the
vendor's tree (via Greg Stein), there is no reason for us ever to make
local changes and then do vendor<-->local merges. However, having it
on a vendor branch is good because if we ever _do_ need to diverge,
even temporarily, we will already be on a vendor branch.

But all of this will fall apart if we commit changes in
subversion/apr/ that overlap with changes in apache/apr, which is
what's been going on. Don't Do It. It's Bad. :-)

Thank you,
-Karl
Received on Sat Oct 21 14:36:05 2006

This is an archived mail posted to the Subversion Dev mailing list.