From mboxrd@z Thu Jan 1 00:00:00 1970 From: Junio C Hamano Subject: Re: [PULL] svn-fe updates for master or next Date: Fri, 27 Jan 2012 20:37:26 -0800 Message-ID: <7vmx98xx15.fsf@alter.siamese.dyndns.org> References: <3BC64515-C4C0-4D32-97B0-8FFD14BB903C@silverinsanity.com> <20120127001041.GB6158@burratino> <20120127003258.GA6946@burratino> <7v39b10z3k.fsf@alter.siamese.dyndns.org> Mime-Version: 1.0 Content-Type: text/plain; charset=us-ascii Cc: Jonathan Nieder , David Barr , Scott Chacon , Brian Gernhardt , david@lang.hm, Ramkumar Ramachandra , git@vger.kernel.org, Dmitry Ivankov To: Junio C Hamano X-From: git-owner@vger.kernel.org Sat Jan 28 05:37:56 2012 Return-path: Envelope-to: gcvg-git-2@lo.gmane.org Received: from vger.kernel.org ([209.132.180.67]) by lo.gmane.org with esmtp (Exim 4.69) (envelope-from ) id 1Rr032-0007af-7X for gcvg-git-2@lo.gmane.org; Sat, 28 Jan 2012 05:37:56 +0100 Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752196Ab2A1Eha (ORCPT ); Fri, 27 Jan 2012 23:37:30 -0500 Received: from b-pb-sasl-quonix.pobox.com ([208.72.237.35]:63785 "EHLO smtp.pobox.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751235Ab2A1Eh3 (ORCPT ); Fri, 27 Jan 2012 23:37:29 -0500 Received: from smtp.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id 95A9B65AD; Fri, 27 Jan 2012 23:37:28 -0500 (EST) 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=02JiJIuIq3OoVtcYwhIt6Q+RIBY=; b=vgmTXN s1PgwBOxdA8K2LIeAiBsaogNJ2dIovzFlQUOz0bBUwUPV1gitOjtRstG0zzO8Hmk Tfs+5MHHdlwLwWLhd7m0VUwixVPCY98HrZjcONSPWsnD80x7En21IqTM3DefvUmQ BCdIzwcCiBjtJDYvUm2JWdsXDEsqoCZKf7CoQ= 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=kiE1ae02Zffqymvt4yIvOedjFo012QcZ xCIDcVGz1p3TvRbx6hiodTYMEWx6nHIO/TGvgwN4dx31PblyrJndTSdrDnSvgk6x HtnIGTmiZz67gTOQrKzU81SRfBzwDfhgC2R9dnKbl2d4fvwAJsa4IQriI9StEW+k wa5LuVM9C94= Received: from b-pb-sasl-quonix.pobox.com (unknown [127.0.0.1]) by b-sasl-quonix.pobox.com (Postfix) with ESMTP id 8C28A65AC; Fri, 27 Jan 2012 23:37:28 -0500 (EST) Received: from pobox.com (unknown [76.102.170.102]) (using TLSv1 with cipher DHE-RSA-AES128-SHA (128/128 bits)) (No client certificate requested) by b-sasl-quonix.pobox.com (Postfix) with ESMTPSA id 0C31965AB; Fri, 27 Jan 2012 23:37:27 -0500 (EST) In-Reply-To: <7v39b10z3k.fsf@alter.siamese.dyndns.org> (Junio C. Hamano's message of "Fri, 27 Jan 2012 10:39:11 -0800") User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/23.2 (gnu/linux) X-Pobox-Relay-ID: C871EC70-4969-11E1-BDEF-9DB42E706CDE-77302942!b-pb-sasl-quonix.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: > Jonathan Nieder writes: > >> Junio, please pull >> >> git://repo.or.cz/git/jrn.git svn-fe >> >> to get the following changes since commit ec014eac0e9e6f30cbbca616090fa2ecf74797e7: >> >> Git 1.7.5 (2011-04-23 23:36:32 -0700) >> >> up to c5bcbcdcfa1e2a1977497cb3a342c0365c8d78d6: >> >> vcs-svn: reset first_commit_done in fast_export_init (2011-06-23 10:04:36 -0500) >> >> I'd even be okay with pulling this for v1.7.9, but application for the >> next release would also be fine with me. It simplifies svn-fe a great >> deal and fulfills a longstanding wish: support for dumps with deltas >> in them. The cost is that commandline usage of the svn-fe tool >> becomes a little more complicated since it no longer keeps state >> itself but instead reads blobs back from fast-import in order to copy >> them between revisions and apply deltas to them. > > Thanks, but will pull after 1.7.9 that was scheduled to happen today. There were some conflicts, but I think I resolved correctly. Please double-check what appears in 'pu'. Thanks.