Return-Path: Delivered-To: apmail-lucene-dev-archive@www.apache.org Received: (qmail 7063 invoked from network); 19 Oct 2010 11:51:40 -0000 Received: from unknown (HELO mail.apache.org) (140.211.11.3) by 140.211.11.9 with SMTP; 19 Oct 2010 11:51:40 -0000 Received: (qmail 23330 invoked by uid 500); 19 Oct 2010 11:51:39 -0000 Delivered-To: apmail-lucene-dev-archive@lucene.apache.org Received: (qmail 23068 invoked by uid 500); 19 Oct 2010 11:51:36 -0000 Mailing-List: contact dev-help@lucene.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@lucene.apache.org Delivered-To: mailing list dev@lucene.apache.org Received: (qmail 23060 invoked by uid 99); 19 Oct 2010 11:51:35 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Oct 2010 11:51:35 +0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests=FREEMAIL_FROM,RCVD_IN_DNSWL_NONE,SPF_PASS,T_TO_NO_BRKTS_FREEMAIL X-Spam-Check-By: apache.org Received-SPF: pass (athena.apache.org: domain of rcmuir@gmail.com designates 209.85.161.48 as permitted sender) Received: from [209.85.161.48] (HELO mail-fx0-f48.google.com) (209.85.161.48) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 19 Oct 2010 11:51:29 +0000 Received: by fxm13 with SMTP id 13so1658996fxm.35 for ; Tue, 19 Oct 2010 04:51:08 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=gamma; h=domainkey-signature:received:mime-version:received:in-reply-to :references:from:date:message-id:subject:to:content-type; bh=YecjWna+iH6535EcdvYJqI0CkCwpZ4xzqBK//pqFonw=; b=pdLbKqZxY/vOyrmjf8ExJf232DTW0UmUASA7BQ1uyBu1NWNp4EGH6BrUre+XaD+W8x Ole0Qwmqk1aeZUMpE3TFpGUFs+USW+am9iDIS4FWbPGaa8Pf+rWG7w47v0wy3Hs5zzv/ aBZQ2KJVWMOw/YrQfg5fJz4BHJBYZp1ndjtqs= DomainKey-Signature: a=rsa-sha1; c=nofws; d=gmail.com; s=gamma; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :content-type; b=QNACEabafrefUYXqs/+8C8cVwP/X/8oyUyoDGHv3E6TkJY4noNE5UoXcMfBlUOZGGU AGZaRWcQF/QxALbxvvfsnZnOS16ocetqaaJzlVBvmyUw/vak1GA11/1i/I+FyjdebiGS n8B0oxPkI6Lbj0GYTLP4UkjNN4IQSFq8R9HB4= Received: by 10.103.161.6 with SMTP id n6mr3832124muo.18.1287489067324; Tue, 19 Oct 2010 04:51:07 -0700 (PDT) MIME-Version: 1.0 Received: by 10.223.96.133 with HTTP; Tue, 19 Oct 2010 04:50:47 -0700 (PDT) In-Reply-To: References: <20101017162837.CECC023888FD@eris.apache.org> From: Robert Muir Date: Tue, 19 Oct 2010 07:50:47 -0400 Message-ID: Subject: Re: svn commit: r1023520 - /lucene/dev/trunk/solr/src/java/org/apache/solr/handler/XmlUpdateRequestHandler.java To: dev@lucene.apache.org, markrmiller@gmail.com Content-Type: text/plain; charset=UTF-8 On Mon, Oct 18, 2010 at 11:46 PM, Mark Miller wrote: > > Is it really worth doing the merges when we are not going to reintegrate? > yes, it tracks what has and has not been backported. as mentioned before, most patches wouldnt apply again anyway. you bring up the same thing as grant, but i dont understand what the "easier" option is: redoing the work again?! again, if you aren't going to use the version control methods, thats your choice. but set the mergeprops properly so that the end result is the same, and those of us using svn can track what has/hasn't been backported. and if you arent using merge/marking merged, i don't know how you keep up with what has/hasn't been backported...! --------------------------------------------------------------------- To unsubscribe, e-mail: dev-unsubscribe@lucene.apache.org For additional commands, e-mail: dev-help@lucene.apache.org