From: Junio C Hamano <gitster@pobox.com>
Date: Sun, 7 Sep 2008 02:39:13 +0000 (-0700)
Subject: Merge git://git.bogomips.org/git-svn
X-Git-Tag: v1.6.1-rc1~269
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=af9552f03082a0cc0cf19d38ae14cc31f1b7fb37;p=git.git

Merge git://git.bogomips.org/git-svn

* git://git.bogomips.org/git-svn:
  git-svn: set auto_props when renaming files
  t9124: clean up chdir usage
  git-svn: fix 'info' tests for unknown items
  git-svn: match SVN 1.5 behaviour of info' on unknown item
  git svn info: always quote URLs in 'info' output
  git svn info: make info relative to the current directory
  git svn info: tests: fix ptouch argument order in setup
  git svn info: tests: use test_cmp instead of git-diff
  git svn info: tests: do not use set -e
  git svn info: tests: let 'init' test run with SVN 1.5
  git svn: catch lack of upstream info for dcommit earlier
  git-svn: check error code of send_txstream
  git-svn: Send deltas during commits
  git-svn: Introduce SVN::Git::Editor::_chg_file_get_blob
  git-svn: extract base blob in generate_diff
---

af9552f03082a0cc0cf19d38ae14cc31f1b7fb37