Andrew's git - gitweb.git/blob - t/t9159-git-svn-no-parent-mergeinfo.sh

   1#!/bin/sh
   2test_description='git svn handling of root commits in merge ranges'
   3. ./lib-git-svn.sh
   4
   5test_expect_success 'test handling of root commits in merge ranges' '
   6        mkdir -p init/trunk init/branches init/tags &&
   7        echo "r1" > init/trunk/file.txt &&
   8        svn_cmd import -m "initial import" init "$svnrepo" &&
   9        svn_cmd co "$svnrepo" tmp &&
  10        (
  11                cd tmp &&
  12                echo "r2" > trunk/file.txt &&
  13                svn_cmd commit -m "Modify file.txt on trunk" &&
  14                svn_cmd cp trunk@1 branches/a &&
  15                svn_cmd commit -m "Create branch a from trunk r1" &&
  16                svn_cmd propset svn:mergeinfo /trunk:1-2 branches/a &&
  17                svn_cmd commit -m "Fake merge of trunk r2 into branch a" &&
  18                mkdir branches/b &&
  19                echo "r5" > branches/b/file2.txt &&
  20                svn_cmd add branches/b &&
  21                svn_cmd commit -m "Create branch b from thin air" &&
  22                echo "r6" > branches/b/file2.txt &&
  23                svn_cmd commit -m "Modify file2.txt on branch b" &&
  24                svn_cmd cp branches/b@5 branches/c &&
  25                svn_cmd commit -m "Create branch c from branch b r5" &&
  26                svn_cmd propset svn:mergeinfo /branches/b:5-6 branches/c &&
  27                svn_cmd commit -m "Fake merge of branch b r6 into branch c"
  28        ) &&
  29        git svn init -s "$svnrepo" &&
  30        git svn fetch
  31        '
  32
  33test_done