Return-Path: Delivered-To: apmail-ant-dev-archive@www.apache.org Received: (qmail 13146 invoked from network); 17 Oct 2007 21:44:19 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 17 Oct 2007 21:44:19 -0000 Received: (qmail 82384 invoked by uid 500); 17 Oct 2007 21:44:06 -0000 Delivered-To: apmail-ant-dev-archive@ant.apache.org Received: (qmail 82064 invoked by uid 500); 17 Oct 2007 21:44:06 -0000 Mailing-List: contact dev-help@ant.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Help: List-Post: List-Id: "Ant Developers List" Reply-To: "Ant Developers List" Delivered-To: mailing list dev@ant.apache.org Received: (qmail 82053 invoked by uid 99); 17 Oct 2007 21:44:06 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Oct 2007 14:44:06 -0700 X-ASF-Spam-Status: No, hits=-0.0 required=10.0 tests=SPF_PASS X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: local policy) Received: from [80.100.149.141] (HELO kruithof.xs4all.nl) (80.100.149.141) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 17 Oct 2007 21:44:07 +0000 Received: from iserv.jkf ([192.168.2.3] helo=[127.0.0.1]) by kruithof.xs4all.nl with esmtp (Exim 4.63) (envelope-from ) id 1IiGcy-0005yd-Kx for dev@ant.apache.org; Wed, 17 Oct 2007 23:40:32 +0200 Message-ID: <47168133.6050204@kruithof.xs4all.nl> Date: Wed, 17 Oct 2007 23:40:03 +0200 From: Martijn Kruithof User-Agent: Thunderbird 2.0.0.6 (Windows/20070728) MIME-Version: 1.0 To: Ant Developers List Subject: Re: svn commit: r585108 - /ant/core/trunk/src/main/org/apache/tools/ant/taskdefs/XSLTProcess.java References: <20071016105102.3D4DD1A9832@eris.apache.org> <4715E150.4080407@apache.org> In-Reply-To: Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked by ClamAV on apache.org Kevin Jackson schreef: >> Tell me how to merge stuff in SVN and I will try! >> > > I just copied'n'pasted :( apparently svn 1.5 will have easier merging > than currently[1] > > http://blog.red-bean.com/sussman/?p=79 > > I've been playing with git recently and I'm very very impressed by > it's performance - cloning the entire linux kernel source is very fast > considering my network connection vs the size of the source tree. > Performing a checkout of a project using svn is less stellar :( > > Kev > > --------------------------------------------------------------------- > To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org > For additional commands, e-mail: dev-help@ant.apache.org > > I am merging using eclipse merge option on svn (with the subversion plugin) --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@ant.apache.org For additional commands, e-mail: dev-help@ant.apache.org