You are viewing a plain text version of this content. The canonical link for it is here.
Posted to docs@httpd.apache.org by Iikka Meriläinen <Ii...@pato.vaala.fi> on 2002/09/29 10:36:58 UTC
A Problem with my windows.xml patch
Hi,
Could someone give a hint on what is wrong with my windows.xml patch that
André committed on Friday/Saturday? It seems that the patch hasn't made its
way to the web pages, and there seem to be conflicts in the CVS when I update
my version of windows.xml.
Do I need to repost my patch (if so, against what version of the file?) and is
this problem with my local versions or your master repository? When I do 'cvs
update -dP windows.xml' it informs about conflicts, and the file contains a
couple of conflicting lines that are exactly the same.
Best regards,
Iikka
******************************************
* Iikka Meriläinen *
* E-mail: Iikka.Merilainen@pato.vaala.fi *
* GSM: +358 (44) 293 3282 *
******************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: docs-unsubscribe@httpd.apache.org
For additional commands, e-mail: docs-help@httpd.apache.org
Re: A Problem with my windows.xml patch
Posted by Joshua Slive <jo...@slive.ca>.
Iikka Meriläinen wrote:
> Do you know when my patch will appear on the live site?
Done.
Joshua.
---------------------------------------------------------------------
To unsubscribe, e-mail: docs-unsubscribe@httpd.apache.org
For additional commands, e-mail: docs-help@httpd.apache.org
Re: A Problem with my windows.xml patch
Posted by Iikka Meriläinen <Ii...@pato.vaala.fi>.
On Sun, 29 Sep 2002, André Malo wrote:
> Someone has to check it out to the live space...
OK. I thought that updating your master CVS automatically updates the web
site, but I'll wait and see what happens.
> hmm. Do you have an original version of your revision? In this case I'd
> suggest to remove the windows.xml in your local cvs repository and check
> out again. Then you can diff against your version and check, whether
> there's something wrong or if cvs is complaining about "nothing".
I did that and everything seems to be OK. The master CVS does have the correct
version.
Do you know when my patch will appear on the live site?
Thanks!
Iikka
******************************************
* Iikka Meriläinen *
* E-mail: Iikka.Merilainen@pato.vaala.fi *
* Vaala, Finland *
******************************************
---------------------------------------------------------------------
To unsubscribe, e-mail: docs-unsubscribe@httpd.apache.org
For additional commands, e-mail: docs-help@httpd.apache.org
Re: A Problem with my windows.xml patch
Posted by André Malo <nd...@perlig.de>.
* Iikka Meriläinen wrote:
> Could someone give a hint on what is wrong with my windows.xml patch
> that André committed on Friday/Saturday? It seems that the patch
> hasn't made its way to the web pages,
Someone has to check it out to the live space...
> and there seem to be conflicts in the CVS when I update
> my version of windows.xml.
>
> Do I need to repost my patch (if so, against what version of the
> file?) and is this problem with my local versions or your master
> repository? When I do 'cvs update -dP windows.xml' it informs about
> conflicts, and the file contains a couple of conflicting lines that
> are exactly the same.
hmm. Do you have an original version of your revision? In this case I'd
suggest to remove the windows.xml in your local cvs repository and check
out again. Then you can diff against your version and check, whether
there's something wrong or if cvs is complaining about "nothing".
The conflict is probably caused by posting the patch inline your mail
(whitespaces etc.).
nd
--
my @japh = (sub{q~Just~},sub{q~Another~},sub{q~Perl~},sub{q~Hacker~});
my $japh = q[sub japh { }]; print join #########################
[ $japh =~ /{(.)}/] -> [0] => map $_ -> () # André Malo #
=> @japh; # http://www.perlig.de/ #
---------------------------------------------------------------------
To unsubscribe, e-mail: docs-unsubscribe@httpd.apache.org
For additional commands, e-mail: docs-help@httpd.apache.org