Delaying 2.0 final

Delaying 2.0 final

[Junio C Hamano]

As we seem to have a few regressions we may want to fix, I will not
be cutting the 2.0 final today (https://tinyurl.com/gitCal).

I queued the following near the bottom of 'pu' (these are also
merged to 'next' to keep pu^{/match.next} in sync with next), and
plan to cut 2.0.0-rc4 early next week.

 * git-gui has a show-stopper bug that wants to see if it is used
   with a version of git that "vsatisfies" 1.7.0; because 2.x is
   considered significantly different, it incorrectly decides to use
   the codepath for ancient versions that compares older than 1.7.0
   when working inside a submodule working tree.  A fix by Jens
   Lehmann is queued as an emergency patch to use vcompare instead.

 * There was a vague admission of having broken git-remote-hg/bzr by
   its author that hinted one topic branch is the culprit, without
   much detail.  As a precautionary measure, the merge of the topic
   has been reverted.

 * git-remote-hg/bzr are maintained outside our tree, our copy will
   become stale and will eventually go away.  A warning message to
   its standard error output has been added to each of them to tell
   the users where to find the latest of these tools.

 * git-request-pull has a minor regression and lost a useful DWIM
   that was designed to be friendly to users of Git older than
   1.7.10.  "git request-pull $base $URL for-linus" used to say
   "Please pull tags/for-linus" if that is what the user meant, but
   the version in 2.0.0-rc3 requires the command line to be "git
   request-pull $base $URL tags/for-linus".  It is simple enough to
   special case this use case, and a patch is included to fix it
   with a band-aid.

If you fetch tonight's 'pu' branch, you will find all of the above
at f608b83.  Hopefully 2.0.0-rc4 and 2.0.0-final will be the same
tree as that commit, with updated release notes.

Re: Delaying 2.0 final

[Jiang Xin]

2014-05-17 6:45 GMT+08:00 Junio C Hamano <gitster@pobox.com>:
> As we seem to have a few regressions we may want to fix, I will not
> be cutting the 2.0 final today (https://tinyurl.com/gitCal).
>
> I queued the following near the bottom of 'pu' (these are also
> merged to 'next' to keep pu^{/match.next} in sync with next), and
> plan to cut 2.0.0-rc4 early next week.
>

So the update window is still open? Please pull this.

The following changes since commit 6308767f0bb58116cb405e1f4f77f5dfc1589920:

  Merge branch 'fc/prompt-zsh-read-from-file' (2014-05-13 11:53:14 -0700)

are available in the git repository at:


  git://github.com/git-l10n/git-po

for you to fetch changes up to a6e888397ce46f9252ca89af46f3f6aaf18baf9b:

  fr: a lot of good fixups (2014-05-17 19:08:59 +0200)

----------------------------------------------------------------
Grégoire Paris (1):
      fr: a lot of good fixups

 po/fr.po | 42 +++++++++++++++++++++---------------------
 1 file changed, 21 insertions(+), 21 deletions(-)


-- 
Jiang Xin

Re: Delaying 2.0 final

[Jiang Xin]

2014-05-18 8:31 GMT+08:00 Jiang Xin <worldhello.net@gmail.com>:
> 2014-05-17 6:45 GMT+08:00 Junio C Hamano <gitster@pobox.com>:
>> As we seem to have a few regressions we may want to fix, I will not
>> be cutting the 2.0 final today (https://tinyurl.com/gitCal).
>>
>> I queued the following near the bottom of 'pu' (these are also
>> merged to 'next' to keep pu^{/match.next} in sync with next), and
>> plan to cut 2.0.0-rc4 early next week.
>>
>
> So the update window is still open? Please pull this.
>
> The following changes since commit 6308767f0bb58116cb405e1f4f77f5dfc1589920:
>
>   Merge branch 'fc/prompt-zsh-read-from-file' (2014-05-13 11:53:14 -0700)
>
> are available in the git repository at:
>
>
>   git://github.com/git-l10n/git-po

It should be:

    git://github.com/git-l10n/git-po master

Next time I should run git request-pull like this:

    git request-pull kernel/master git-po HEAD:master

-- 
Jiang Xin