Andrew's git - gitweb.git/blob - t/t9150-svk-mergetickets.sh

   1#!/bin/sh
   2#
   3# Copyright (c) 2007 Sam Vilain
   4#
   5
   6test_description='git-svn svk merge tickets'
   7
   8. ./lib-git-svn.sh
   9
  10test_expect_success 'load svk depot' "
  11        svnadmin load -q '$rawsvnrepo' < '../t9150/svk-merge.dump' &&
  12        git svn init --minimize-url -R svkmerge \
  13          -T trunk -b branches '$svnrepo' &&
  14        git svn fetch --all
  15        "
  16
  17uuid=b48289b2-9c08-4d72-af37-0358a40b9c15
  18
  19test_expect_success 'svk merges were represented coming in' "
  20        [ `git-cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
  21        "
  22
  23test_done