Skip to content

Commit

Permalink
Merge branch 'maint'
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
Shawn O. Pearce committed Sep 30, 2008
2 parents 416f80a + 0a1a1c8 commit 8b745e3
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Documentation/git-svn.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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'
Expand All @@ -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
Expand All @@ -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
------------------------------------------------------------------------
Expand Down
2 changes: 1 addition & 1 deletion git-svn.perl
Original file line number Diff line number Diff line change
Expand Up @@ -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},
Expand Down
Empty file modified t/t0024-crlf-archive.sh
100644 → 100755
Empty file.

0 comments on commit 8b745e3

Please sign in to comment.