t/t9151/make-svnmerge-dump

   1 #!/bin/sh
   2 #
   3 # this script sets up a Subversion repository for Makefile in the
   4 # first ever git merge, as if it were done with svnmerge (SVN 1.5+)
   5 #
   6
   7 rm -rf foo.svn foo
   8 set -e
   9
  10 mkdir foo.svn
  11 svnadmin create foo.svn
  12 svn co file://`pwd`/foo.svn foo
  13
  14 cd foo
  15 mkdir trunk
  16 mkdir branches
  17 svn add trunk branches
  18 svn commit -m "Setup trunk and branches"
  19 cd trunk
  20
  21 git cat-file blob 6683463e:Makefile > Makefile
  22 svn add Makefile
  23
  24 echo "Committing ANCESTOR"
  25 svn commit -m "ancestor"
  26 cd ..
  27 svn cp trunk branches/left
  28
  29 echo "Committing BRANCH POINT"
  30 svn commit -m "make left branch"
  31 svn cp trunk branches/right
  32
  33 echo "Committing other BRANCH POINT"
  34 svn commit -m "make right branch"
  35 cd branches/left/
  36
  37 #$sm init
  38 #svn commit -m "init svnmerge"
  39
  40 git cat-file blob 5873b67e:Makefile > Makefile
  41 echo "Committing BRANCH UPDATE 1"
  42 svn commit -m "left update 1"
  43 cd ../..
  44
  45 cd trunk
  46 git cat-file blob 75118b13:Makefile > Makefile
  47 echo "Committing TRUNK UPDATE"
  48 svn commit -m "trunk update"
  49
  50 cd ../branches/left
  51 git cat-file blob ff5ebe39:Makefile > Makefile
  52 echo "Committing BRANCH UPDATE 2"
  53 svn commit -m "left update 2"
  54
  55 git cat-file blob b5039db6:Makefile > Makefile
  56 echo "Committing BRANCH UPDATE 3"
  57 svn commit -m "left update 3"
  58
  59 # merge to trunk
  60
  61 cd ../..
  62 svn update
  63 cd trunk
  64
  65 svn merge ../branches/left --accept postpone
  66
  67 git cat-file blob b51ad431:Makefile > Makefile
  68
  69 svn resolved Makefile
  70
  71 svn commit -m "Merge trunk 1"
  72
  73 # create commits on both branches
  74
  75 cd ../branches/left
  76 git cat-file blob ff5ebe39:Makefile > Makefile
  77 echo "Committing BRANCH UPDATE 4"
  78 svn commit -m "left update 4"
  79
  80 cd ../right
  81 git cat-file blob b5039db6:Makefile > Makefile
  82 echo "Committing other BRANCH UPDATE 1"
  83 svn commit -m "right update 1"
  84
  85 # merge to trun again
  86
  87 cd ../..
  88 svn update
  89 cd trunk
  90
  91 svn merge ../branches/left --accept postpone
  92
  93 git cat-file blob b51ad431:Makefile > Makefile
  94
  95 svn resolved Makefile
  96
  97 svn commit -m "Merge trunk 2"
  98
  99 cd ../..
 100
 101 svnadmin dump foo.svn > svn-mergeinfo.dump
 102
 103 rm -rf foo foo.svn