From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PATCH 26/27] t/*svn*: fix moderate &&-chain breakage Date: Fri, 20 Mar 2015 12:35:56 -0700 Message-ID: References: <550C2E7B.3030203@drmicha.warpmail.net> <317e6b1e70f3e1c50d62207c53f4d038ad027c9d.1426861743.git.git@drmicha.warpmail.net> Mime-Version: 1.0 Content-Type: text/plain Cc: git@vger.kernel.org, Jeff King , Eric Wong To: Michael J Gruber X-From: git-owner@vger.kernel.org Fri Mar 20 20:36:15 2015 Return-path: Envelope-to: gcvg-git-2@plane.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by plane.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1YZ2iC-00084I-L8 for gcvg-git-2@plane.gmane.org; Fri, 20 Mar 2015 20:36:05 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751403AbbCTTgA (ORCPT ); Fri, 20 Mar 2015 15:36:00 -0400 Received: from pb-smtp1.int.icgroup.com ([208.72.237.35]:51862 "EHLO sasl.smtp.pobox.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1751037AbbCTTf7 (ORCPT ); Fri, 20 Mar 2015 15:35:59 -0400 Received: from sasl.smtp.pobox.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 99412405BF; Fri, 20 Mar 2015 15:35:58 -0400 (EDT) DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; s=sasl; bh=sSsQuZt9q0gTTBMPQK/mBUiupsA=; b=J2AZFY aqMOBpaqcWUXyD6wbwRNmU6DPfz26gwdJVUqUoocnK12w6ZCUBiBbqhnsrQHDQi+ nFQ8eYRpHisCBOqfsdF5JqhNAB5vNW2uRqYPNuhrPUCYi83I9jus9AmLQnqh+BxJ +9fjQCVQLhVjqSE3VfBiqGO4pOvjmR0qlzbqI= DomainKey-Signature: a=rsa-sha1; c=nofws; d=pobox.com; h=from:to:cc :subject:references:date:in-reply-to:message-id:mime-version :content-type; q=dns; s=sasl; b=x2fJ1OIj3pMvcGmZ1mTmGVaLGJ6mZTmj KW2Kk9pdlFymAfllsTWmK+iXvkNPRmdmP898fTe9np8rRSIYlUikxT7MRDwuBdNB NlH0Zz2M6X4t0EVRetgH1EpCrOGmBvwJ/koJophW7m6NKhc+ameFzWkDE1iGgPaY hBBEMmoaowE= Received: from pb-smtp1.int.icgroup.com (unknown [127.0.0.1]) by pb-smtp1.pobox.com (Postfix) with ESMTP id 8FB82405BE; Fri, 20 Mar 2015 15:35:58 -0400 (EDT) Received: from pobox.com (unknown [72.14.226.9]) (using TLSv1.2 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by pb-smtp1.pobox.com (Postfix) with ESMTPSA id 149B7405BB; Fri, 20 Mar 2015 15:35:58 -0400 (EDT) In-Reply-To: (Junio C. Hamano's message of "Fri, 20 Mar 2015 11:04:42 -0700") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/24.3 (gnu/linux) X-Pobox-Relay-ID: 551C0B68-CF38-11E4-82E4-6DD39F42C9D4-77302942!pb-smtp1.pobox.com Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Archived-At: Junio C Hamano writes: > Michael J Gruber writes: > >> All of these cases are moderate since they would most probably not >> lead to missed failing tests: Either they would fail otherwise, >> or fail a rm in test_when_finished only. >> >> Signed-off-by: Michael J Gruber >> --- >> t/t2026-prune-linked-checkouts.sh | 4 ++-- >> t/t9158-git-svn-mergeinfo.sh | 4 ++-- >> t/t9161-git-svn-mergeinfo-push.sh | 10 +++++----- >> 3 files changed, 9 insertions(+), 9 deletions(-) > > Ahh, it seems that I should have read everything in my inbox before > starting my day X-<. I already queued an identical patch for 2026 > on nd/multiple-work-trees, and its new tip is in 'next' now. > > Which branches are the git-svn ones meant to apply? Are they meant > to fix an existing bug already in master, or are they new ones added > by still-in-flight topics? Can you split if necessary and mark them > for individual topios in flight if that is the case, so that we can > apply them independently from GIT_TEST_CHAIN_LINT series? > > Thanks. OK, I think I figured it out. All the git-svn bits in 26 and 27 are for 'master', and should be part of Peff's original 25-patch series. I'll drop 2026 from your 26/25 and queue it together with your 27/25 on top off it.