kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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
maint
Shawn O. Pearce 2008-09-30 14:14:09 -07:00
parent 416f80a60b 0a1a1c8615
commit 8b745e3ffd
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Documentation/git-svn.txt
View File

@ -473,7 +473,7 @@ Tracking and contributing to the trunk of a Subversion-managed project:


------------------------------------------------------------------------ ------------------------------------------------------------------------
# Clone a repo (like git clone): # 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: # Enter the newly cloned directory:
cd trunk cd trunk
# You should be on master branch, double-check with git-branch # 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): # 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: # View all branches and tags you have cloned:
git branch -r git branch -r
# Reset your master to trunk (or any other branch, replacing 'trunk' # 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 # 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 # Clone locally - make sure the refs/remotes/ space matches the server
mkdir project mkdir project
cd 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 config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
git fetch git fetch
# Initialize git-svn locally (be sure to use the same URL and -T/-b/-t options as were used on server) # 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 # Pull the latest changes from Subversion
git svn rebase git svn rebase
------------------------------------------------------------------------ ------------------------------------------------------------------------

2
git-svn.perl
View File

@ -2591,7 +2591,7 @@ sub set_tree {
my ($self, $tree) = (shift, shift); my ($self, $tree) = (shift, shift);
my $log_entry = ::get_commit_entry($tree); my $log_entry = ::get_commit_entry($tree);
unless ($self->{last_rev}) { 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}, my %ed_opts = ( r => $self->{last_rev},
log => $log_entry->{log}, log => $log_entry->{log},

0
t/t0024-crlf-archive.sh Normal file → Executable file
View File