Return-Path: Delivered-To: apmail-cocoon-dev-archive@www.apache.org Received: (qmail 52135 invoked from network); 3 May 2005 21:22:06 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 3 May 2005 21:22:06 -0000 Received: (qmail 1988 invoked by uid 500); 3 May 2005 21:23:45 -0000 Delivered-To: apmail-cocoon-dev-archive@cocoon.apache.org Received: (qmail 1903 invoked by uid 500); 3 May 2005 21:23:44 -0000 Mailing-List: contact dev-help@cocoon.apache.org; run by ezmlm Precedence: bulk list-help: list-unsubscribe: List-Post: Reply-To: dev@cocoon.apache.org Delivered-To: mailing list dev@cocoon.apache.org Received: (qmail 1888 invoked by uid 99); 3 May 2005 21:23:44 -0000 X-ASF-Spam-Status: No, hits=0.1 required=10.0 tests=FORGED_RCVD_HELO X-Spam-Check-By: apache.org Received-SPF: pass (hermes.apache.org: local policy) Received: from agssa.net (HELO ags01.agsoftware.dnsalias.com) (165.98.153.184) by apache.org (qpsmtpd/0.28) with ESMTP; Tue, 03 May 2005 14:23:44 -0700 Received: from ags01.agsoftware.dnsalias.com (localhost.localdomain [127.0.0.1]) by ags01.agsoftware.dnsalias.com (8.13.1/8.13.1) with ESMTP id j43LLrtV021228 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO) for ; Tue, 3 May 2005 16:21:53 -0500 Received: (from apache@localhost) by ags01.agsoftware.dnsalias.com (8.13.1/8.13.1/Submit) id j43LLqJT021227; Tue, 3 May 2005 16:21:52 -0500 X-Authentication-Warning: ags01.agsoftware.dnsalias.com: apache set sender to agallardo@agssa.net using -f Received: from 165.98.153.184 (proxying for 10.0.0.5) (SquirrelMail authenticated user agallardo) by www.agssa.net with HTTP; Tue, 3 May 2005 16:21:52 -0500 (CDT) Message-ID: <58204.165.98.153.184.1115155312.squirrel@www.agssa.net> In-Reply-To: <4277E4E0.8060208@reverycodes.com> References: <55861.165.98.153.184.1115145354.squirrel@www.agssa.net> <4277D2A5.8050706@reverycodes.com> <57024.165.98.153.184.1115151260.squirrel@www.agssa.net> <4277E4E0.8060208@reverycodes.com> Date: Tue, 3 May 2005 16:21:52 -0500 (CDT) Subject: Re: How-to revert a change? From: "Antonio Gallardo" To: dev@cocoon.apache.org User-Agent: SquirrelMail/1.4.4-1.FC3 MIME-Version: 1.0 Content-Type: text/plain;charset=iso-8859-1 Content-Transfer-Encoding: 8bit X-Priority: 3 (Normal) Importance: Normal X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N On Mar, 3 de Mayo de 2005, 15:53, Vadim Gritsenko dijo: > Antonio Gallardo wrote: >> On Mar, 3 de Mayo de 2005, 14:36, Vadim Gritsenko dijo: >> >>>Antonio Gallardo wrote: >>> >>>>I want revert changes in src/java/org/apache/cocoon/util/NetUtils.java >>>>from HEAD to 53864. >>>> >>>>How to do this? >>> >>>svn merge -r HEAD:53864 src/java/org/apache/cocoon/util/NetUtils.java >>>src/java/org/apache/cocoon/util/NetUtils.java >> >> >> This is what I tried and don't work here. Dunno why. > > What happens? svn merge -r HEAD:165501 https://svn.apache.org/repos/asf/cocoon/branches/BRANCH_2_1_X/src/java/org/apache/cocoon/util/NetUtils.java svn: requerimiento REPORT fall� en '/repos/asf/!svn/vcc/default' svn: Cannot replace a directory from within The same using -r53864 I followed this: http://svnbook.red-bean.com/en/1.0/ch04s04.html#svn-ch-4-sect-4.2 And here is the SVN versionI use on Fedora 3: svn, versi�n 1.1.4 (r13838) compilado Apr 5 2005, 05:18:28 >> Can you revert this? > > Sure. Reverted on BRANCH_2_1_X only. Thanks. Fortunately, I just updated the 2.1 branch. - 0 - I need also to revert the code in TraxTransformer. But I will do it by hand, because there are changes in the javadocs. Best Regards, Antonio Gallardo.