From: Junio C Hamano <gitster@pobox.com>
Date: Wed, 10 Dec 2008 06:41:27 +0000 (-0800)
Subject: Merge branch 'maint'
X-Git-Tag: v1.6.1-rc3~10
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/5363d0744e7360beee990d3c2a8c1eb64a23071e?hp=-c

Merge branch 'maint'

* maint:
work around Python warnings from AsciiDoc
git-svn: Make following parents atomic
---

5363d0744e7360beee990d3c2a8c1eb64a23071e
diff --combined Documentation/user-manual.txt
index 9f527d3b2e,99cb80878b..d4b1e90f94
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@@ -13,27 -13,17 +13,27 @@@ to build and test a particular version 
  regressions, and so on.
  
  People needing to do actual development will also want to read
- <<Developing-with-git>> and <<sharing-development>>.
+ <<Developing-With-git>> and <<sharing-development>>.
  
  Further chapters cover more specialized topics.
  
  Comprehensive reference documentation is available through the man
 -pages.  For a command such as "git clone <repo>", just use
 +pages, or linkgit:git-help[1] command.  For example, for the command
 +"git clone <repo>", you can either use:
  
  ------------------------------------------------
  $ man git-clone
  ------------------------------------------------
  
 +or:
 +
 +------------------------------------------------
 +$ git help clone
 +------------------------------------------------
 +
 +With the latter, you can use the manual viewer of your choice; see
 +linkgit:git-help[1] for more information.
 +
  See also <<git-quick-start>> for a brief overview of git commands,
  without any explanation.
  
@@@ -399,7 -389,7 +399,7 @@@ the order it uses to decide which to ch
  references with the same shorthand name, see the "SPECIFYING
  REVISIONS" section of linkgit:git-rev-parse[1].
  
- [[Updating-a-repository-with-git-fetch]]
+ [[Updating-a-repository-With-git-fetch]]
  Updating a repository with git-fetch
  ------------------------------------
  
@@@ -955,7 -945,7 +955,7 @@@ echo "git diff --stat --summary -M v$la
  and then he just cut-and-pastes the output commands after verifying that
  they look OK.
  
- [[Finding-comments-with-given-content]]
+ [[Finding-comments-With-given-Content]]
  Finding commits referencing a file with given content
  ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
  
@@@ -972,7 -962,7 +972,7 @@@ Figuring out why this works is left as 
  student.  The linkgit:git-log[1], linkgit:git-diff-tree[1], and
  linkgit:git-hash-object[1] man pages may prove helpful.
  
- [[Developing-with-git]]
+ [[Developing-With-git]]
  Developing with git
  ===================
  
@@@ -1675,7 -1665,7 +1675,7 @@@ dangling objects can arise in other sit
  Sharing development with others
  ===============================
  
- [[getting-updates-with-git-pull]]
+ [[getting-updates-With-git-pull]]
  Getting updates with git-pull
  -----------------------------
  
@@@ -1683,7 -1673,7 +1683,7 @@@ After you clone a repository and make 
  may wish to check the original repository for updates and merge them
  into your own work.
  
- We have already seen <<Updating-a-repository-with-git-fetch,how to
+ We have already seen <<Updating-a-repository-With-git-fetch,how to
  keep remote tracking branches up to date>> with linkgit:git-fetch[1],
  and how to merge two branches.  So you can merge in changes from the
  original repository's master branch with:
@@@ -1794,7 -1784,7 +1794,7 @@@ Public git repositorie
  
  Another way to submit changes to a project is to tell the maintainer
  of that project to pull the changes from your repository using
- linkgit:git-pull[1].  In the section "<<getting-updates-with-git-pull,
+ linkgit:git-pull[1].  In the section "<<getting-updates-With-git-pull,
  Getting updates with git-pull>>" we described this as a way to get
  updates from the "main" repository, but it works just as well in the
  other direction.
@@@ -2004,7 -1994,7 +2004,7 @@@ $ git push ssh://yourserver.com/~you/pr
  Normally whenever a branch head in a public repository is modified, it
  is modified to point to a descendant of the commit that it pointed to
  before.  By forcing a push in this situation, you break that convention.
- (See <<problems-with-rewriting-history>>.)
+ (See <<problems-With-rewriting-history>>.)
  
  Nevertheless, this is a common practice for people that need a simple
  way to publish a work-in-progress patch series, and it is an acceptable
@@@ -2573,7 -2563,7 +2573,7 @@@ There are numerous other tools, such a
  purpose of maintaining a patch series.  These are outside of the scope of
  this manual.
  
- [[problems-with-rewriting-history]]
+ [[problems-With-rewriting-history]]
  Problems with rewriting history
  -------------------------------
  
@@@ -4366,9 -4356,7 +4366,9 @@@ $ git remote show example	# get detail
  * remote example
    URL: git://example.com/project.git
    Tracked remote branches
 -    master next ...
 +    master
 +    next
 +    ...
  $ git fetch example		# update branches from example
  $ git branch -r			# list all remote branches
  -----------------------------------------------
diff --combined git-svn.perl
index e64e97b4de,25ed2f4333..2c206e9178
--- a/git-svn.perl
+++ b/git-svn.perl
@@@ -66,7 -66,7 +66,7 @@@ my ($_stdin, $_help, $_edit
  	$_version, $_fetch_all, $_no_rebase,
  	$_merge, $_strategy, $_dry_run, $_local,
  	$_prefix, $_no_checkout, $_url, $_verbose,
 -	$_git_format, $_commit_url);
 +	$_git_format, $_commit_url, $_tag);
  $Git::SVN::_follow_parent = 1;
  my %remote_opts = ( 'username=s' => \$Git::SVN::Prompt::_username,
                      'config-dir=s' => \$Git::SVN::Ra::config_dir,
@@@ -131,15 -131,6 +131,15 @@@ my %cmd = 
  			  'revision|r=i' => \$_revision,
  			  'no-rebase' => \$_no_rebase,
  			%cmt_opts, %fc_opts } ],
 +	branch => [ \&cmd_branch,
 +	            'Create a branch in the SVN repository',
 +	            { 'message|m=s' => \$_message,
 +	              'dry-run|n' => \$_dry_run,
 +		      'tag|t' => \$_tag } ],
 +	tag => [ sub { $_tag = 1; cmd_branch(@_) },
 +	         'Create a tag in the SVN repository',
 +	         { 'message|m=s' => \$_message,
 +	           'dry-run|n' => \$_dry_run } ],
  	'set-tree' => [ \&cmd_set_tree,
  	                "Set an SVN repository to a git tree-ish",
  			{ 'stdin|' => \$_stdin, %cmt_opts, %fc_opts, } ],
@@@ -223,13 -214,11 +223,13 @@@ unless ($cmd && $cmd =~ /(?:clone|init|
  			    "but it is not a directory\n";
  		}
  		my $git_dir = delete $ENV{GIT_DIR};
 -		chomp(my $cdup = command_oneline(qw/rev-parse --show-cdup/));
 -		unless (length $cdup) {
 -			die "Already at toplevel, but $git_dir ",
 -			    "not found '$cdup'\n";
 -		}
 +		my $cdup = undef;
 +		git_cmd_try {
 +			$cdup = command_oneline(qw/rev-parse --show-cdup/);
 +			$git_dir = '.' unless ($cdup);
 +			chomp $cdup if ($cdup);
 +			$cdup = "." unless ($cdup && length $cdup);
 +		} "Already at toplevel, but $git_dir not found\n";
  		chdir $cdup or die "Unable to chdir up to '$cdup'\n";
  		unless (-d $git_dir) {
  			die "$git_dir still not found after going to ",
@@@ -432,15 -421,15 +432,15 @@@ sub cmd_dcommit 
  	$head ||= 'HEAD';
  	my @refs;
  	my ($url, $rev, $uuid, $gs) = working_head_info($head, \@refs);
 +	unless ($gs) {
 +		die "Unable to determine upstream SVN information from ",
 +		    "$head history.\nPerhaps the repository is empty.";
 +	}
  	$url = defined $_commit_url ? $_commit_url : $gs->full_url;
  	my $last_rev = $_revision if defined $_revision;
  	if ($url) {
  		print "Committing to $url ...\n";
  	}
 -	unless ($gs) {
 -		die "Unable to determine upstream SVN information from ",
 -		    "$head history.\nPerhaps the repository is empty.";
 -	}
  	my ($linear_refs, $parents) = linearize_history($gs, \@refs);
  	if ($_no_rebase && scalar(@$linear_refs) > 1) {
  		warn "Attempting to commit more than one change while ",
@@@ -548,42 -537,6 +548,42 @@@
  	unlink $gs->{index};
  }
  
 +sub cmd_branch {
 +	my ($branch_name, $head) = @_;
 +
 +	unless (defined $branch_name && length $branch_name) {
 +		die(($_tag ? "tag" : "branch") . " name required\n");
 +	}
 +	$head ||= 'HEAD';
 +
 +	my ($src, $rev, undef, $gs) = working_head_info($head);
 +
 +	my $remote = Git::SVN::read_all_remotes()->{$gs->{repo_id}};
 +	my $glob = $remote->{ $_tag ? 'tags' : 'branches' };
 +	my ($lft, $rgt) = @{ $glob->{path} }{qw/left right/};
 +	my $dst = join '/', $remote->{url}, $lft, $branch_name, ($rgt || ());
 +
 +	my $ctx = SVN::Client->new(
 +		auth    => Git::SVN::Ra::_auth_providers(),
 +		log_msg => sub {
 +			${ $_[0] } = defined $_message
 +				? $_message
 +				: 'Create ' . ($_tag ? 'tag ' : 'branch ' )
 +				. $branch_name;
 +		},
 +	);
 +
 +	eval {
 +		$ctx->ls($dst, 'HEAD', 0);
 +	} and die "branch ${branch_name} already exists\n";
 +
 +	print "Copying ${src} at r${rev} to ${dst}...\n";
 +	$ctx->copy($src, $rev, $dst)
 +		unless $_dry_run;
 +
 +	$gs->fetch_all;
 +}
 +
  sub cmd_find_rev {
  	my $revision_or_hash = shift or die "SVN or git revision required ",
  	                                    "as a command-line argument\n";
@@@ -850,28 -803,8 +850,28 @@@ sub cmd_commit_diff 
  	}
  }
  
 +sub escape_uri_only {
 +	my ($uri) = @_;
 +	my @tmp;
 +	foreach (split m{/}, $uri) {
 +		s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
 +		push @tmp, $_;
 +	}
 +	join('/', @tmp);
 +}
 +
 +sub escape_url {
 +	my ($url) = @_;
 +	if ($url =~ m#^([^:]+)://([^/]*)(.*)$#) {
 +		my ($scheme, $domain, $uri) = ($1, $2, escape_uri_only($3));
 +		$url = "$scheme://$domain$uri";
 +	}
 +	$url;
 +}
 +
  sub cmd_info {
  	my $path = canonicalize_path(defined($_[0]) ? $_[0] : ".");
 +	my $fullpath = canonicalize_path($cmd_dir_prefix . $path);
  	if (exists $_[1]) {
  		die "Too many arguments specified\n";
  	}
@@@ -879,8 -812,8 +879,8 @@@
  	my ($file_type, $diff_status) = find_file_type_and_diff_status($path);
  
  	if (!$file_type && !$diff_status) {
 -		print STDERR "$path:  (Not a versioned resource)\n\n";
 -		return;
 +		print STDERR "svn: '$path' is not under version control\n";
 +		exit 1;
  	}
  
  	my ($url, $rev, $uuid, $gs) = working_head_info('HEAD');
@@@ -892,21 -825,21 +892,21 @@@
  	# canonicalize_path() will return "" to make libsvn 1.5.x happy,
  	$path = "." if $path eq "";
  
 -	my $full_url = $url . ($path eq "." ? "" : "/$path");
 +	my $full_url = $url . ($fullpath eq "" ? "" : "/$fullpath");
  
  	if ($_url) {
 -		print $full_url, "\n";
 +		print escape_url($full_url), "\n";
  		return;
  	}
  
  	my $result = "Path: $path\n";
  	$result .= "Name: " . basename($path) . "\n" if $file_type ne "dir";
 -	$result .= "URL: " . $full_url . "\n";
 +	$result .= "URL: " . escape_url($full_url) . "\n";
  
  	eval {
  		my $repos_root = $gs->repos_root;
  		Git::SVN::remove_username($repos_root);
 -		$result .= "Repository Root: $repos_root\n";
 +		$result .= "Repository Root: " . escape_url($repos_root) . "\n";
  	};
  	if ($@) {
  		$result .= "Repository Root: (offline)\n";
@@@ -928,7 -861,7 +928,7 @@@
  	}
  
  	my ($lc_author, $lc_rev, $lc_date_utc);
 -	my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $path);
 +	my @args = Git::SVN::Log::git_svn_log_cmd($rev, $rev, "--", $fullpath);
  	my $log = command_output_pipe(@args);
  	my $esc_color = qr/(?:\033\[(?:(?:\d+;)*\d*)?m)*/;
  	while (<$log>) {
@@@ -1138,19 -1071,9 +1138,19 @@@ sub get_commit_entry 
  		system($editor, $commit_editmsg);
  	}
  	rename $commit_editmsg, $commit_msg or croak $!;
 -	open $log_fh, '<', $commit_msg or croak $!;
 -	{ local $/; chomp($log_entry{log} = <$log_fh>); }
 -	close $log_fh or croak $!;
 +	{
 +		# SVN requires messages to be UTF-8 when entering the repo
 +		local $/;
 +		open $log_fh, '<', $commit_msg or croak $!;
 +		binmode $log_fh;
 +		chomp($log_entry{log} = <$log_fh>);
 +
 +		if (my $enc = Git::config('i18n.commitencoding')) {
 +			require Encode;
 +			Encode::from_to($log_entry{log}, $enc, 'UTF-8');
 +		}
 +		close $log_fh or croak $!;
 +	}
  	unlink $commit_msg;
  	\%log_entry;
  }
@@@ -2285,14 -2208,6 +2285,14 @@@ sub do_git_commit 
  	}
  	defined(my $pid = open3(my $msg_fh, my $out_fh, '>&STDERR', @exec))
  	                                                           or croak $!;
 +	binmode $msg_fh;
 +
 +	# we always get UTF-8 from SVN, but we may want our commits in
 +	# a different encoding.
 +	if (my $enc = Git::config('i18n.commitencoding')) {
 +		require Encode;
 +		Encode::from_to($log_entry->{log}, 'UTF-8', $enc);
 +	}
  	print $msg_fh $log_entry->{log} or croak $!;
  	restore_commit_header_env($old_env);
  	unless ($self->no_metadata) {
@@@ -2403,12 -2318,20 +2403,20 @@@ sub find_parent_branch 
  		$gs = Git::SVN->init($u, $p, $repo_id, $ref_id, 1);
  	}
  	my ($r0, $parent) = $gs->find_rev_before($r, 1);
- 	if (!defined $r0 || !defined $parent) {
- 		my ($base, $head) = parse_revision_argument(0, $r);
- 		if ($base <= $r) {
+ 	{
+ 		my ($base, $head);
+ 		if (!defined $r0 || !defined $parent) {
+ 			($base, $head) = parse_revision_argument(0, $r);
+ 		} else {
+ 			if ($r0 < $r) {
+ 				$gs->ra->get_log([$gs->{path}], $r0 + 1, $r, 1,
+ 					0, 1, sub { $base = $_[1] - 1 });
+ 			}
+ 		}
+ 		if (defined $base && $base <= $r) {
  			$gs->fetch($base, $r);
  		}
- 		($r0, $parent) = $gs->last_rev_commit;
+ 		($r0, $parent) = $gs->find_rev_before($r, 1);
  	}
  	if (defined $r0 && defined $parent) {
  		print STDERR "Found branch parent: ($self->{ref_id}) $parent\n";
@@@ -2691,9 -2614,9 +2699,9 @@@ sub rebuild_from_rev_db 
  sub rebuild {
  	my ($self) = @_;
  	my $map_path = $self->map_path;
 -	return if (-e $map_path && ! -z $map_path);
 +	my $partial = (-e $map_path && ! -z $map_path);
  	return unless ::verify_ref($self->refname.'^0');
 -	if ($self->use_svm_props || $self->no_metadata) {
 +	if (!$partial && ($self->use_svm_props || $self->no_metadata)) {
  		my $rev_db = $self->rev_db_path;
  		$self->rebuild_from_rev_db($rev_db);
  		if ($self->use_svm_props) {
@@@ -2703,13 -2626,10 +2711,13 @@@
  		$self->unlink_rev_db_symlink;
  		return;
  	}
 -	print "Rebuilding $map_path ...\n";
 +	print "Rebuilding $map_path ...\n" if (!$partial);
 +	my ($base_rev, $head) = ($partial ? $self->rev_map_max_norebuild(1) :
 +		(undef, undef));
  	my ($log, $ctx) =
  	    command_output_pipe(qw/rev-list --pretty=raw --no-color --reverse/,
 -	                        $self->refname, '--');
 +				($head ? "$head.." : "") . $self->refname,
 +				'--');
  	my $metadata_url = $self->metadata_url;
  	remove_username($metadata_url);
  	my $svn_uuid = $self->ra_uuid;
@@@ -2732,17 -2652,12 +2740,17 @@@
  		    ($metadata_url && $url && ($url ne $metadata_url))) {
  			next;
  		}
 +		if ($partial && $head) {
 +			print "Partial-rebuilding $map_path ...\n";
 +			print "Currently at $base_rev = $head\n";
 +			$head = undef;
 +		}
  
  		$self->rev_map_set($rev, $c);
  		print "r$rev = $c\n";
  	}
  	command_close_pipe($log, $ctx);
 -	print "Done rebuilding $map_path\n";
 +	print "Done rebuilding $map_path\n" if (!$partial || !$head);
  	my $rev_db_path = $self->rev_db_path;
  	if (-f $self->rev_db_path) {
  		unlink $self->rev_db_path or croak "unlink: $!";
@@@ -2882,12 -2797,6 +2890,12 @@@ sub rev_map_set 
  sub rev_map_max {
  	my ($self, $want_commit) = @_;
  	$self->rebuild;
 +	my ($r, $c) = $self->rev_map_max_norebuild($want_commit);
 +	$want_commit ? ($r, $c) : $r;
 +}
 +
 +sub rev_map_max_norebuild {
 +	my ($self, $want_commit) = @_;
  	my $map_path = $self->map_path;
  	stat $map_path or return $want_commit ? (0, undef) : 0;
  	sysopen(my $fh, $map_path, O_RDONLY) or croak "open: $!";
@@@ -3332,11 -3241,11 +3340,11 @@@ sub change_file_prop 
  
  sub apply_textdelta {
  	my ($self, $fb, $exp) = @_;
 -	my $fh = Git::temp_acquire('svn_delta');
 +	my $fh = $::_repository->temp_acquire('svn_delta');
  	# $fh gets auto-closed() by SVN::TxDelta::apply(),
  	# (but $base does not,) so dup() it for reading in close_file
  	open my $dup, '<&', $fh or croak $!;
 -	my $base = Git::temp_acquire('git_blob');
 +	my $base = $::_repository->temp_acquire('git_blob');
  	if ($fb->{blob}) {
  		print $base 'link ' if ($fb->{mode_a} == 120000);
  		my $size = $::_repository->cat_blob($fb->{blob}, $base);
@@@ -3377,8 -3286,7 +3385,8 @@@ sub close_file 
  				warn "$path has mode 120000",
  						" but is not a link\n";
  			} else {
 -				my $tmp_fh = Git::temp_acquire('svn_hash');
 +				my $tmp_fh = $::_repository->temp_acquire(
 +					'svn_hash');
  				my $res;
  				while ($res = sysread($fh, my $str, 1024)) {
  					my $out = syswrite($tmp_fh, $str, $res);
@@@ -3480,12 -3388,11 +3488,12 @@@ sub generate_diff 
  	while (<$diff_fh>) {
  		chomp $_; # this gets rid of the trailing "\0"
  		if ($state eq 'meta' && /^:(\d{6})\s(\d{6})\s
 -					$::sha1\s($::sha1)\s
 +					($::sha1)\s($::sha1)\s
  					([MTCRAD])\d*$/xo) {
  			push @mods, {	mode_a => $1, mode_b => $2,
 -					sha1_b => $3, chg => $4 };
 -			if ($4 =~ /^(?:C|R)$/) {
 +					sha1_a => $3, sha1_b => $4,
 +					chg => $5 };
 +			if ($5 =~ /^(?:C|R)$/) {
  				$state = 'file_a';
  			} else {
  				$state = 'file_b';
@@@ -3558,7 -3465,7 +3566,7 @@@ sub repo_path 
  sub url_path {
  	my ($self, $path) = @_;
  	if ($self->{url} =~ m#^https?://#) {
 -		$path =~ s/([^a-zA-Z0-9_.-])/uc sprintf("%%%02x",ord($1))/eg;
 +		$path =~ s/([^~a-zA-Z0-9_.-])/uc sprintf("%%%02x",ord($1))/eg;
  	}
  	$self->{url} . '/' . $self->repo_path($path);
  }
@@@ -3737,7 -3644,6 +3745,7 @@@ sub R 
  	my $fbat = $self->add_file($self->repo_path($m->{file_b}), $pbat,
  				$self->url_path($m->{file_a}), $self->{r});
  	print "\tR\t$m->{file_a} => $m->{file_b}\n" unless $::_q;
 +	$self->apply_autoprops($file, $fbat);
  	$self->chg_file($fbat, $m);
  	$self->close_file($fbat,undef,$self->{pool});
  
@@@ -3764,52 -3670,33 +3772,52 @@@ sub change_file_prop 
  	$self->SUPER::change_file_prop($fbat, $pname, $pval, $self->{pool});
  }
  
 -sub chg_file {
 -	my ($self, $fbat, $m) = @_;
 -	if ($m->{mode_b} =~ /755$/ && $m->{mode_a} !~ /755$/) {
 -		$self->change_file_prop($fbat,'svn:executable','*');
 -	} elsif ($m->{mode_b} !~ /755$/ && $m->{mode_a} =~ /755$/) {
 -		$self->change_file_prop($fbat,'svn:executable',undef);
 -	}
 -	my $fh = Git::temp_acquire('git_blob');
 -	if ($m->{mode_b} =~ /^120/) {
 +sub _chg_file_get_blob ($$$$) {
 +	my ($self, $fbat, $m, $which) = @_;
 +	my $fh = $::_repository->temp_acquire("git_blob_$which");
 +	if ($m->{"mode_$which"} =~ /^120/) {
  		print $fh 'link ' or croak $!;
  		$self->change_file_prop($fbat,'svn:special','*');
 -	} elsif ($m->{mode_a} =~ /^120/ && $m->{mode_b} !~ /^120/) {
 +	} elsif ($m->{mode_a} =~ /^120/ && $m->{"mode_$which"} !~ /^120/) {
  		$self->change_file_prop($fbat,'svn:special',undef);
  	}
 -	my $size = $::_repository->cat_blob($m->{sha1_b}, $fh);
 -	croak "Failed to read object $m->{sha1_b}" if ($size < 0);
 +	my $blob = $m->{"sha1_$which"};
 +	return ($fh,) if ($blob =~ /^0{40}$/);
 +	my $size = $::_repository->cat_blob($blob, $fh);
 +	croak "Failed to read object $blob" if ($size < 0);
  	$fh->flush == 0 or croak $!;
  	seek $fh, 0, 0 or croak $!;
  
  	my $exp = ::md5sum($fh);
  	seek $fh, 0, 0 or croak $!;
 +	return ($fh, $exp);
 +}
  
 +sub chg_file {
 +	my ($self, $fbat, $m) = @_;
 +	if ($m->{mode_b} =~ /755$/ && $m->{mode_a} !~ /755$/) {
 +		$self->change_file_prop($fbat,'svn:executable','*');
 +	} elsif ($m->{mode_b} !~ /755$/ && $m->{mode_a} =~ /755$/) {
 +		$self->change_file_prop($fbat,'svn:executable',undef);
 +	}
 +	my ($fh_a, $exp_a) = _chg_file_get_blob $self, $fbat, $m, 'a';
 +	my ($fh_b, $exp_b) = _chg_file_get_blob $self, $fbat, $m, 'b';
  	my $pool = SVN::Pool->new;
 -	my $atd = $self->apply_textdelta($fbat, undef, $pool);
 -	my $got = SVN::TxDelta::send_stream($fh, @$atd, $pool);
 -	die "Checksum mismatch\nexpected: $exp\ngot: $got\n" if ($got ne $exp);
 -	Git::temp_release($fh, 1);
 +	my $atd = $self->apply_textdelta($fbat, $exp_a, $pool);
 +	if (-s $fh_a) {
 +		my $txstream = SVN::TxDelta::new ($fh_a, $fh_b, $pool);
 +		my $res = SVN::TxDelta::send_txstream($txstream, @$atd, $pool);
 +		if (defined $res) {
 +			die "Unexpected result from send_txstream: $res\n",
 +			    "(SVN::Core::VERSION: $SVN::Core::VERSION)\n";
 +		}
 +	} else {
 +		my $got = SVN::TxDelta::send_stream($fh_b, @$atd, $pool);
 +		die "Checksum mismatch\nexpected: $exp_b\ngot: $got\n"
 +		    if ($got ne $exp_b);
 +	}
 +	Git::temp_release($fh_b, 1);
 +	Git::temp_release($fh_a, 1);
  	$pool->clear;
  }
  
@@@ -3911,7 -3798,7 +3919,7 @@@ sub escape_uri_only 
  	my ($uri) = @_;
  	my @tmp;
  	foreach (split m{/}, $uri) {
 -		s/([^\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
 +		s/([^~\w.%+-]|%(?![a-fA-F0-9]{2}))/sprintf("%%%02X",ord($1))/eg;
  		push @tmp, $_;
  	}
  	join('/', @tmp);
diff --combined t/t9104-git-svn-follow-parent.sh
index 0a091e048e,d80ea64e49..ab9fa32220
--- a/t/t9104-git-svn-follow-parent.sh
+++ b/t/t9104-git-svn-follow-parent.sh
@@@ -3,7 -3,7 +3,7 @@@
  # Copyright (c) 2006 Eric Wong
  #
  
 -test_description='git-svn fetching'
 +test_description='git svn fetching'
  . ./lib-git-svn.sh
  
  test_expect_success 'initialize repo' '
@@@ -27,8 -27,8 +27,8 @@@
  	'
  
  test_expect_success 'init and fetch a moved directory' '
 -	git-svn init --minimize-url -i thunk "$svnrepo"/thunk &&
 -	git-svn fetch -i thunk &&
 +	git svn init --minimize-url -i thunk "$svnrepo"/thunk &&
 +	git svn fetch -i thunk &&
  	test "`git rev-parse --verify refs/remotes/thunk@2`" \
             = "`git rev-parse --verify refs/remotes/thunk~1`" &&
          test "`git cat-file blob refs/remotes/thunk:readme |\
@@@ -43,7 -43,7 +43,7 @@@ test_expect_success 'init and fetch fro
            trunk:refs/remotes/svn/trunk &&
          git config --add svn-remote.svn.fetch \
            thunk:refs/remotes/svn/thunk &&
 -        git-svn fetch -i svn/thunk &&
 +        git svn fetch -i svn/thunk &&
  	test "`git rev-parse --verify refs/remotes/svn/trunk`" \
             = "`git rev-parse --verify refs/remotes/svn/thunk~1`" &&
          test "`git cat-file blob refs/remotes/svn/thunk:readme |\
@@@ -57,8 -57,8 +57,8 @@@ test_expect_success 'follow deleted par
                 -r2 "$svnrepo"/trunk "$svnrepo"/junk) &&
          git config --add svn-remote.svn.fetch \
            junk:refs/remotes/svn/junk &&
 -        git-svn fetch -i svn/thunk &&
 -        git-svn fetch -i svn/junk &&
 +        git svn fetch -i svn/thunk &&
 +        git svn fetch -i svn/junk &&
          test -z "`git diff svn/junk svn/trunk`" &&
          test "`git merge-base svn/junk svn/trunk`" \
             = "`git rev-parse svn/trunk`"
@@@ -69,9 -69,9 +69,9 @@@ test_expect_success 'follow larger pare
          echo hi > import/trunk/thunk/bump/thud/file &&
          svn import -m "import a larger parent" import "$svnrepo"/larger-parent &&
          svn cp -m "hi" "$svnrepo"/larger-parent "$svnrepo"/another-larger &&
 -        git-svn init --minimize-url -i larger \
 +        git svn init --minimize-url -i larger \
            "$svnrepo"/another-larger/trunk/thunk/bump/thud &&
 -        git-svn fetch -i larger &&
 +        git svn fetch -i larger &&
          git rev-parse --verify refs/remotes/larger &&
          git rev-parse --verify \
             refs/remotes/larger-parent/trunk/thunk/bump/thud &&
@@@ -92,15 -92,15 +92,15 @@@ test_expect_success 'follow higher-leve
                  cd ..
          svn mkdir -m "new glob at top level" "$svnrepo"/glob &&
          svn mv -m "move blob down a level" "$svnrepo"/blob "$svnrepo"/glob/blob &&
 -        git-svn init --minimize-url -i blob "$svnrepo"/glob/blob &&
 -        git-svn fetch -i blob
 +        git svn init --minimize-url -i blob "$svnrepo"/glob/blob &&
 +        git svn fetch -i blob
          '
  
  test_expect_success 'follow deleted directory' '
  	svn mv -m "bye!" "$svnrepo"/glob/blob/hi "$svnrepo"/glob/blob/bye &&
  	svn rm -m "remove glob" "$svnrepo"/glob &&
 -	git-svn init --minimize-url -i glob "$svnrepo"/glob &&
 -	git-svn fetch -i glob &&
 +	git svn init --minimize-url -i glob "$svnrepo"/glob &&
 +	git svn fetch -i glob &&
  	test "`git cat-file blob refs/remotes/glob:blob/bye`" = hi &&
  	test "`git ls-tree refs/remotes/glob | wc -l `" -eq 1
  	'
@@@ -129,9 -129,9 +129,9 @@@ test_expect_success 'follow-parent avoi
  	  poke native/t/c.t &&
  	  svn commit -m "reorg test" &&
  	cd .. &&
 -	git-svn init --minimize-url -i r9270-t \
 +	git svn init --minimize-url -i r9270-t \
  	  "$svnrepo"/r9270/trunk/subversion/bindings/swig/perl/native/t &&
 -	git-svn fetch -i r9270-t &&
 +	git svn fetch -i r9270-t &&
  	test `git rev-list r9270-t | wc -l` -eq 2 &&
  	test "`git ls-tree --name-only r9270-t~1`" = \
  	     "`git ls-tree --name-only r9270-t`"
@@@ -139,9 -139,9 +139,9 @@@
  
  test_expect_success "track initial change if it was only made to parent" '
  	svn cp -m "wheee!" "$svnrepo"/r9270/trunk "$svnrepo"/r9270/drunk &&
 -	git-svn init --minimize-url -i r9270-d \
 +	git svn init --minimize-url -i r9270-d \
  	  "$svnrepo"/r9270/drunk/subversion/bindings/swig/perl/native/t &&
 -	git-svn fetch -i r9270-d &&
 +	git svn fetch -i r9270-d &&
  	test `git rev-list r9270-d | wc -l` -eq 3 &&
  	test "`git ls-tree --name-only r9270-t`" = \
  	     "`git ls-tree --name-only r9270-d`" &&
@@@ -149,21 -149,63 +149,63 @@@
  	     "`git rev-parse r9270-d~1`"
  	'
  
+ test_expect_success "follow-parent is atomic" '
+ 	(
+ 		cd wc &&
+ 		svn up &&
+ 		svn mkdir stunk &&
+ 		echo "trunk stunk" > stunk/readme &&
+ 		svn add stunk/readme &&
+ 		svn ci -m "trunk stunk" &&
+ 		echo "stunk like junk" >> stunk/readme &&
+ 		svn ci -m "really stunk" &&
+ 		echo "stink stank stunk" >> stunk/readme &&
+ 		svn ci -m "even the grinch agrees"
+ 	) &&
+ 	svn copy -m "stunk flunked" "$svnrepo"/stunk "$svnrepo"/flunk &&
+ 	{ svn cp -m "early stunk flunked too" \
+ 		"$svnrepo"/stunk@17 "$svnrepo"/flunked ||
+ 	svn cp -m "early stunk flunked too" \
+ 		-r17 "$svnrepo"/stunk "$svnrepo"/flunked; } &&
+ 	git svn init --minimize-url -i stunk "$svnrepo"/stunk &&
+ 	git svn fetch -i stunk &&
+ 	git update-ref refs/remotes/flunk@18 refs/remotes/stunk~2 &&
+ 	git update-ref -d refs/remotes/stunk &&
+ 	git config --unset svn-remote.svn.fetch stunk &&
+ 	mkdir -p "$GIT_DIR"/svn/flunk@18 &&
+ 	rev_map=$(cd "$GIT_DIR"/svn/stunk && ls .rev_map*) &&
+ 	dd if="$GIT_DIR"/svn/stunk/$rev_map \
+ 	   of="$GIT_DIR"/svn/flunk@18/$rev_map bs=24 count=1 &&
+ 	rm -rf "$GIT_DIR"/svn/stunk &&
+ 	git svn init --minimize-url -i flunk "$svnrepo"/flunk &&
+ 	git svn fetch -i flunk &&
+ 	git svn init --minimize-url -i stunk "$svnrepo"/stunk &&
+ 	git svn fetch -i stunk &&
+ 	git svn init --minimize-url -i flunked "$svnrepo"/flunked &&
+ 	git svn fetch -i flunked
+ 	test "`git rev-parse --verify refs/remotes/flunk@18`" \
+ 	   = "`git rev-parse --verify refs/remotes/stunk`" &&
+ 	test "`git rev-parse --verify refs/remotes/flunk~1`" \
+ 	   = "`git rev-parse --verify refs/remotes/stunk`" &&
+ 	test "`git rev-parse --verify refs/remotes/flunked~1`" \
+ 	   = "`git rev-parse --verify refs/remotes/stunk~1`"
+ 	'
+ 
  test_expect_success "track multi-parent paths" '
  	svn cp -m "resurrect /glob" "$svnrepo"/r9270 "$svnrepo"/glob &&
 -	git-svn multi-fetch &&
 +	git svn multi-fetch &&
  	test `git cat-file commit refs/remotes/glob | \
  	       grep "^parent " | wc -l` -eq 2
  	'
  
  test_expect_success "multi-fetch continues to work" "
 -	git-svn multi-fetch
 +	git svn multi-fetch
  	"
  
  test_expect_success "multi-fetch works off a 'clean' repository" '
  	rm -r "$GIT_DIR/svn" "$GIT_DIR/refs/remotes" "$GIT_DIR/logs" &&
  	mkdir "$GIT_DIR/svn" &&
 -	git-svn multi-fetch
 +	git svn multi-fetch
  	'
  
  test_debug 'gitk --all &'