Skip to content

Commit 8b745e3

Browse files
committed
Merge branch 'maint'
* 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
2 parents 416f80a + 0a1a1c8 commit 8b745e3

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

Documentation/git-svn.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -473,7 +473,7 @@ Tracking and contributing to the trunk of a Subversion-managed project:
473473

474474
------------------------------------------------------------------------
475475
# Clone a repo (like git clone):
476-
git svn clone http://svn.foo.org/project/trunk
476+
git svn clone http://svn.example.com/project/trunk
477477
# Enter the newly cloned directory:
478478
cd trunk
479479
# You should be on master branch, double-check with git-branch
@@ -495,7 +495,7 @@ Tracking and contributing to an entire Subversion-managed project
495495

496496
------------------------------------------------------------------------
497497
# Clone a repo (like git clone):
498-
git svn clone http://svn.foo.org/project -T trunk -b branches -t tags
498+
git svn clone http://svn.example.com/project -T trunk -b branches -t tags
499499
# View all branches and tags you have cloned:
500500
git branch -r
501501
# Reset your master to trunk (or any other branch, replacing 'trunk'
@@ -514,7 +514,7 @@ have each person clone that repository with 'git-clone':
514514

515515
------------------------------------------------------------------------
516516
# Do the initial import on a server
517-
ssh server "cd /pub && git svn clone http://svn.foo.org/project
517+
ssh server "cd /pub && git svn clone http://svn.example.com/project
518518
# Clone locally - make sure the refs/remotes/ space matches the server
519519
mkdir project
520520
cd project
@@ -523,7 +523,7 @@ have each person clone that repository with 'git-clone':
523523
git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
524524
git fetch
525525
# Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server)
526-
git svn init http://svn.foo.org/project
526+
git svn init http://svn.example.com/project
527527
# Pull the latest changes from Subversion
528528
git svn rebase
529529
------------------------------------------------------------------------

git-svn.perl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2591,7 +2591,7 @@ sub set_tree {
25912591
my ($self, $tree) = (shift, shift);
25922592
my $log_entry = ::get_commit_entry($tree);
25932593
unless ($self->{last_rev}) {
2594-
fatal("Must have an existing revision to commit");
2594+
::fatal("Must have an existing revision to commit");
25952595
}
25962596
my %ed_opts = ( r => $self->{last_rev},
25972597
log => $log_entry->{log},

t/t0024-crlf-archive.sh

100644100755
File mode changed.

0 commit comments

Comments
 (0)