Mailing-List: contact cocoon-dev-help@xml.apache.org; run by ezmlm
Precedence: bulk
Reply-To: cocoon-dev@xml.apache.org
From: "Carsten Ziegeler" <cziegeler@s-und-n.de>
To: <cocoon-dev@xml.apache.org>
Subject: RE: CVS repository changes... (and what's left to do)
Date: Thu, 27 Feb 2003 08:30:42 +0100
Message-ID: <LKENJPKDAIKAPKHEOCMMEEDGCNAA.cziegeler@s-und-n.de>
MIME-Version: 1.0
In-Reply-To: <BA8330A1.1456A%pier@betaversion.org>
Importance: Normal
Content-Transfer-Encoding: 7bit
Content-Type: text/plain;
	charset="us-ascii"

Hi Pier,

afaik we didn't voted/proposed or whatever to do the repository changes
now. We said that we will do it sometime soon.
I appreciate your work, BUT as even Stefano pointed out in the past,
it is IMHO not good to call the new cvs cocoon-2.0 rsp. cocoon-2.1
because this will lead to a new repository for each version, and this
is really not the best idea.

I think we agreed to rename the xml-cocoon2 cvs to simply cocoon and
I don't see a point why we should make two repositories for 2.0 and 2.1.
Why are the branches not sufficient?

So, unfortunately you already renamed them...I think it's best to revert
your changes asap, then we as a community can decide about the new
layout and then rename/move whatever. Do you think that this is a good
approach?

Carsten

Pier Fumagalli wrote:
>
> Ok, got a few extra hours tonight, so I just did it! :-)
>
> The old "xml-cocoon2" repository has been moved to
> "cocoon-2-historic", but
> a symlink with the old name is preserved so that you can do those
> nifty "cvs
> diff" and see what _you_ changed in there...
>
> Same thing happened for "xml-cocoon", renamed to "cocoon-1", but
> preserving
> the old name as a symlink, and "xml-cocoon2-apps" renamed to
> "cocoon-2-apps"
> (old name preserved, but should I just blast this? Nicola-Ken?)...
>
> Two new repositories have been created, containing the latest CVS versions
> of 2.0 and 2.1, those are called, respectively, "cocoon-2.0" and
> "cocoon-2.1"... Do a checkout and tell me there's something wrong
> with them.
>
> If you were working on something in the "old" repository, the
> easiest way to
> do this is by doing the following:
>
> # cd ~/checkouts/xml-cocoon2
> # cvs diff -u3 > /tmp/patch
> # cd ~/checkouts
> # cvs co cocoon-2.1
> # cd cocoon-2.1
> # cvs update -Apd
> # patch -p0 < /tmp/patch
> # rm -f /tmp/patch
>
> Windows folks, please translate the above POSIX shell commands in
> something
> suitable in your environment! :-)
>
> Now, the only things left to do are removing the symlinks with
> the old names
> once you're all happy with the changes, and fixing up various bits in the
> mail system, but I can do that in a few days, once everyone has its local
> copy of Cocoon checked out right on his machine (like, me... Gotta update
> the copies at work tomorrow)...
>
> Now, call me "fascist" :-) if you want, but to avoid people to commit back
> to the old repository names, I've removed YOU ALL karma to the old
> repositories... I call it "defensive administration" :-) It's a
> concept that
> Brian taught me back in 1997... If you want to commit, you'll have to use
> the new repository names (so, as outlined above, do the patch against the
> old repo, checkout the new one, apply the patch, and commit)...
>
> Note, on my Netra-T1, now updating the whole repository for
> Cocoon 2.1 takes
> less than 1/3 of the time it required before! :-) :-)
>
> Have fun! :-)
>
>     Pier (yes, in case of emergencies, we can revert back in 15 minutes)
>