Add test for git-svn with submodule/merge layout.

tests/test-lib.sh

 #!/bin/bash
 
 # Abort on error.
 set -e
 
 export DEPOT_TOOLS_UPDATE=0
 
 PWD=`pwd`
 REPO_URL=file://$PWD/svnrepo
 TRUNK_URL=$REPO_URL/trunk
@@ skipping 28 matching lines @@
 
 # Set up a git-svn checkout of the repo.
 setup_gitsvn() {
   echo "Setting up test git-svn repo..."
   rm -rf git-svn
   # There appears to be no way to make git-svn completely shut up, so we
   # redirect its output.
   git svn -q clone -s $REPO_URL git-svn >/dev/null 2>&1
 }
 
+# Set up a git-svn checkout of the repo and apply merge commits
+# (like the submodule repo layout).
+setup_gitsvn_submodule() {
+  echo "Setting up test remote git-svn-submodule repo..."
+  rm -rf git-svn-submodule
+  git svn -q clone -s $REPO_URL git-svn-submodule >/dev/null 2>&1
+  svn_revision=`svn info file://$PWD/svnrepo | grep ^Revision | \
+                sed s/^.*:// | xargs`
+  (
+    cd git-svn-submodule
+    echo 'merge-file line 1' > merge-file
+    git add merge-file; git commit -q -m 'First non-svn commit on master'
+    git checkout -q refs/remotes/trunk
+    git merge -q --no-commit --no-ff refs/heads/master >/dev/null 2>&1
+    echo 'merge-edit-file line 1' > merge-edit-file
+    git add merge-edit-file
+    git commit -q -m "SVN changes up to revision $svn_revision"
+    git update-ref refs/heads/master HEAD
+    git checkout master
+  )
+}
+
 # Set up a git repo that has a few commits to master.
 setup_initgit() {
   echo "Setting up test upstream git repo..."
   rm -rf gitrepo
   mkdir gitrepo
 
   (
     cd gitrepo
     git init -q
     echo "test" > test
     git add test
     git commit -qam "initial commit"
     echo "test2" >> test
     git commit -qam "second commit"
     # Hack: make sure master is not the current branch
     #       otherwise push will give a warning
     git checkout -q -b foo
   )
 }
 
 # Set up a git checkout of the repo.
 setup_gitgit() {
   echo "Setting up test git repo..."
   rm -rf git-git
   git clone -q $GITREPO_URL git-git
 }
 
 cleanup() {
-  rm -rf gitrepo svnrepo svn git-git git-svn
+  rm -rf gitrepo svnrepo svn git-git git-svn git-svn-submodule
 }
 
 # Usage: test_expect_success "description of test" "test code".
 test_expect_success() {
   echo "TESTING: $1"
   exit_code=0
   sh -c "$2" || exit_code=$?
   if [ $exit_code != 0 ]; then
     echo "FAILURE: $1"
     return $exit_code
@@ skipping 10 matching lines @@
     return $exit_code
   fi
 }
 
 # Grab the XSRF token from the review server and print it to stdout.
 print_xsrf_token() {
   curl --cookie dev_appserver_login="test@example.com:False" \
     --header 'X-Requesting-XSRF-Token: 1' \
     http://localhost:8080/xsrf_token 2>/dev/null
 }