Merge branch 'maint'

spearce · spearce · commit 8b745e3ffdab · 2008-09-30T14:14:09.000-07:00
* maint:
  git-svn: call 'fatal' correctly in set-tree
  Replace svn.foo.org with svn.example.com in git-svn docs (RFC 2606)
  t0024: add executable permission
diff --git a/Documentation/git-svn.txt b/Documentation/git-svn.txt
@@ -473,7 +473,7 @@ Tracking and contributing to the trunk of a Subversion-managed project:
 
 ------------------------------------------------------------------------
 # Clone a repo (like git clone):
-	git svn clone http://svn.foo.org/project/trunk
+	git svn clone http://svn.example.com/project/trunk
 # Enter the newly cloned directory:
 	cd trunk
 # You should be on master branch, double-check with git-branch
@@ -495,7 +495,7 @@ Tracking and contributing to an entire Subversion-managed project
 
 ------------------------------------------------------------------------
 # Clone a repo (like git clone):
-	git svn clone http://svn.foo.org/project -T trunk -b branches -t tags
+	git svn clone http://svn.example.com/project -T trunk -b branches -t tags
 # View all branches and tags you have cloned:
 	git branch -r
 # Reset your master to trunk (or any other branch, replacing 'trunk'
@@ -514,7 +514,7 @@ have each person clone that repository with 'git-clone':
 
 ------------------------------------------------------------------------
 # Do the initial import on a server
-	ssh server "cd /pub && git svn clone http://svn.foo.org/project
+	ssh server "cd /pub && git svn clone http://svn.example.com/project
 # Clone locally - make sure the refs/remotes/ space matches the server
 	mkdir project
 	cd project
@@ -523,7 +523,7 @@ have each person clone that repository with 'git-clone':
 	git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
 	git fetch
 # Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server)
-	git svn init http://svn.foo.org/project
+	git svn init http://svn.example.com/project
 # Pull the latest changes from Subversion
 	git svn rebase
 ------------------------------------------------------------------------
diff --git a/git-svn.perl b/git-svn.perl
@@ -2591,7 +2591,7 @@ sub set_tree {
 	my ($self, $tree) = (shift, shift);
 	my $log_entry = ::get_commit_entry($tree);
 	unless ($self->{last_rev}) {
-		fatal("Must have an existing revision to commit");
+		::fatal("Must have an existing revision to commit");
 	}
 	my %ed_opts = ( r => $self->{last_rev},
 	                log => $log_entry->{log},
diff --git a/t/t0024-crlf-archive.sh b/t/t0024-crlf-archive.sh

Original file line number	Diff line number	Diff line change
`@@ -2591,7 +2591,7 @@ sub set_tree {`
`2591`	`2591`	`my ($self, $tree) = (shift, shift);`
`2592`	`2592`	`my $log_entry = ::get_commit_entry($tree);`
`2593`	`2593`	`unless ($self->{last_rev}) {`
`2594`		`- fatal("Must have an existing revision to commit");`
	`2594`	`+ ::fatal("Must have an existing revision to commit");`
`2595`	`2595`	`}`
`2596`	`2596`	`my %ed_opts = ( r => $self->{last_rev},`
`2597`	`2597`	`log => $log_entry->{log},`