Andrew's git - gitweb.git/blob - t/t9151-svn-mergeinfo.sh

   1#!/bin/sh
   2#
   3# Copyright (c) 2007, 2009 Sam Vilain
   4#
   5
   6test_description='git-svn svn mergeinfo properties'
   7
   8. ./lib-git-svn.sh
   9
  10test_expect_success 'load svn dump' "
  11        svnadmin load -q '$rawsvnrepo' \
  12          < '$TEST_DIRECTORY/t9151/svn-mergeinfo.dump' &&
  13        git svn init --minimize-url -R svnmerge \
  14          -T trunk -b branches '$svnrepo' &&
  15        git svn fetch --all
  16        "
  17
  18test_expect_success 'represent svn merges without intervening commits' "
  19        [ `git cat-file commit HEAD^1 | grep parent | wc -l` -eq 2 ]
  20        "
  21
  22test_expect_success 'represent svn merges with intervening commits' "
  23        [ `git cat-file commit HEAD | grep parent | wc -l` -eq 2 ]
  24        "
  25
  26test_done