global/git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2026-03-18 12:40:05 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into next

Browse Source 
* master:
  t9157-*.sh: Add an svn version check
  git svn: fix the final example in man page
This commit is contained in:
Junio C Hamano
2011-01-07 15:27:25 -08:00
parent 438e47c91d e17aa8a9dc
commit 600460d4ce
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Documentation/git-svn.txt
View File

@@ -729,8 +729,11 @@ have each person clone that repository with 'git clone':
cd project cd project
git init git init
git remote add origin server:/pub/project git remote add origin server:/pub/project
git config --add remote.origin.fetch '+refs/remotes/*:refs/remotes/*' git config --replace-all remote.origin.fetch '+refs/remotes/*:refs/remotes/*'
git fetch git fetch
# Prevent fetch/pull from remote git server in the future,
# we only want to use git svn for future updates
git config --remove-section remote.origin
# Create a local branch from one of the branches just fetched # Create a local branch from one of the branches just fetched
git checkout -b master FETCH_HEAD git checkout -b master FETCH_HEAD
# 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)

8
t/t9157-git-svn-fetch-merge.sh
View File

@@ -6,6 +6,14 @@
test_description='git svn merge detection' test_description='git svn merge detection'
. ./lib-git-svn.sh . ./lib-git-svn.sh
svn_ver="$(svn --version --quiet)"
case $svn_ver in
[0-1].[0-4].[0-6])
skip_all="skipping git-svn test - SVN too old ($svn_ver)"
test_done
;;
esac
test_expect_success 'initialize source svn repo' ' test_expect_success 'initialize source svn repo' '
svn_cmd mkdir -m x "$svnrepo"/trunk && svn_cmd mkdir -m x "$svnrepo"/trunk &&
svn_cmd mkdir -m x "$svnrepo"/branches && svn_cmd mkdir -m x "$svnrepo"/branches &&