Re: [PULL] svn-fe updates for master or next

From: Junio C Hamano <gitster@pobox.com>
Date: Jan 28, 2012, 04:37 UTC
Message-ID: <7vmx98xx15.fsf@alter.siamese.dyndns.org>
In-Reply-To: <7v39b10z3k.fsf@alter.siamese.dyndns.org>

Junio C Hamano <gitster@pobox.com> writes:

Show 23 quoted lines

> Jonathan Nieder <jrnieder@gmail.com> 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.