public inbox for git@vger.kernel.org 
 help / color / mirror / Atom feed

From: Junio C Hamano <gitster@pobox•com>
To: Eric Wong <normalperson@yhbt•net>
Cc: Mike <ipso@snappymail•ca>, Minty <mintywalker@gmail•com>,
	"Nico Schlömer" <nico.schloemer@gmail•com>,
	"Valery Yundin" <yuvalery@gmail•com>,
	"Kyle J. McKay" <mackyle@gmail•com>,
	"Ryuichi Kokubo" <ryu1kkb@gmail•com>,
	git@vger•kernel.org
Subject: Re: [PULL] git-svn updates for master
Date: Thu, 26 Feb 2015 14:06:13 -0800	[thread overview]
Message-ID: <xmqq61aol44q.fsf@gitster.dls.corp.google.com> (raw)
In-Reply-To: <20150226213515.GB2930@dcvr.yhbt.net> (Eric Wong's message of "Thu, 26 Feb 2015 21:35:16 +0000")

Eric Wong <normalperson@yhbt•net> writes:

> Hi Junio, mainly bugfixes but a tiny amount of progress on lazy-loading.
> The bugfixes from Kyle and Ryuichi should also be applied to maint.

I think you mean "cherry-picked".  Let me try to rearrange them by
doing the following:

0. Grab your stuff.

    $ git fetch git://bogomips.org/git-svn.git master

1. Queue two fixes for maint-2.2

    $ git checkout -b svn-maint-fixes maint-2.2
    $ git cherry-pick -s -2 FETCH_HEAD

2. Queue the other one for master, together with the other two

    $ git co -b svn-fixes FETCH_HEAD~2
    $ git merge --no-edit svn-maint-fixes

3. Make sure I got that right by comparing with yours

    $ git diff FETCH_HEAD
    ... no output ...

Then I'll merge svn-fixes to my 'master' and hopefully we can later
merge svn-maint-fixes to 'maint' and 'maint-2.2'.

Thanks.    

> Thanks.
>
> The following changes since commit 7f4ba4b6e3ba7075ca6b379ba23fd3088cbe69a8:
>
>   Post 2.3 cyle (batch #5) (2015-02-25 15:44:04 -0800)
>
> are available in the git repository at:
>
>   git://bogomips.org/git-svn.git master
>
> for you to fetch changes up to e0b4cad4fd77e4cd787c3ed26e7650fc4de8bcd2:
>
>   Git::SVN::*: avoid premature FileHandle closure (2015-02-26 20:19:41 +0000)
>
> ----------------------------------------------------------------
> Eric Wong (1):
>       git-svn: lazy load some modules
>
> Kyle J. McKay (1):
>       Git::SVN::*: avoid premature FileHandle closure
>
> Ryuichi Kokubo (1):
>       git-svn: fix localtime=true on non-glibc environments
>
>  git-svn.perl            | 13 +++++++------
>  perl/Git/SVN.pm         | 25 +++++++++++++++----------
>  perl/Git/SVN/Editor.pm  |  3 +--
>  perl/Git/SVN/Fetcher.pm | 11 +++++++++--
>  perl/Git/SVN/Ra.pm      |  8 +++++++-
>  5 files changed, 39 insertions(+), 21 deletions(-)

next prev parent reply	other threads:[~2015-02-26 22:06 UTC|newest]

Thread overview: 3+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-26 21:35 [PULL] git-svn updates for master Eric Wong
2015-02-26 22:06 ` Junio C Hamano [this message]
  -- strict thread matches above, loose matches on Subject: below --
2013-01-24  1:28 [PATCH] git-svn: cleanup sprintf usage for uppercasing hex Eric Wong
2013-01-24  1:32 ` [PULL] git-svn updates for master Eric Wong

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=xmqq61aol44q.fsf@gitster.dls.corp.google.com \
    --to=gitster@pobox$(echo .)com \
    --cc=git@vger$(echo .)kernel.org \
    --cc=ipso@snappymail$(echo .)ca \
    --cc=mackyle@gmail$(echo .)com \
    --cc=mintywalker@gmail$(echo .)com \
    --cc=nico.schloemer@gmail$(echo .)com \
    --cc=normalperson@yhbt$(echo .)net \
    --cc=ryu1kkb@gmail$(echo .)com \
    --cc=yuvalery@gmail$(echo .)com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox