cocoon-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Ovidiu Predescu <ovi...@cup.hp.com>
Subject Re: [C2.1-dev] [PATCH] Major changes in Source interface and others
Date Sat, 25 Aug 2001 23:59:24 GMT
On Sun, 26 Aug 2001 00:45:39 +0200 (CEST), giacomo <giacomo@apache.org> wrote:

> On Sat, 25 Aug 2001, Ovidiu Predescu wrote:
> 
> > Oops, sorry about this. I forgot to use the -N option when generating
> > the diff, so the ModifiableSource.java was not included. Here it is.
> 
> No, it was included but I forgot to do the "cvs add".
> Please, next time cd into the repo before doing the "cvs diff -ru". I
> had to rename my repo to xml-cocoon2 because you did the diff outsite
> the repo.

I usually cd in my local copy of the cvs, then apply the patch using:

patch -p1 <patch-filename.diff

The -p1 option to 'patch' will remove my source directory name from
the patch and will apply cleanly.

The reason I have to do it this way is because I have my own CVS
repository to which I import from time to time on a branch the 2.1-dev
main trunk. This way I can maintain my own local changes under source
control, and don't loose track of the changes. From time to time I
take changes done in this local repository, create a patch and post it
to the mailing list. Unfortunately this does add some overhead in the
whole process, and may cause errors from time to time.

Greetings,
-- 
Ovidiu Predescu <ovidiu@cup.hp.com>
http://orion.nsr.hp.com/ (inside HP's firewall only)
http://sourceforge.net/users/ovidiu/ (my SourceForge page)
http://www.geocities.com/SiliconValley/Monitor/7464/ (GNU, Emacs, other stuff)

---------------------------------------------------------------------
To unsubscribe, e-mail: cocoon-dev-unsubscribe@xml.apache.org
For additional commands, email: cocoon-dev-help@xml.apache.org


Mime
View raw message