#!/bin/sh # # Copyright (c) 2007 Sam Vilain # global test_description := ''git-svn svk merge tickets'' source ./lib-git-svn.sh test_expect_success 'load svk depot' " svnadmin load -q '$rawsvnrepo' \ < '$TEST_DIRECTORY/t9150/svk-merge.dump' && git svn init --minimize-url -R svkmerge \ --rewrite-root=http://svn.example.org \ -T trunk -b branches '$svnrepo' && git svn fetch --all " global uuid := 'b48289b2-9c08-4d72-af37-0358a40b9c15' test_expect_success 'svk merges were represented coming in' " [ $[git cat-file commit HEAD | grep parent | wc -l] -eq 2 ] " test_done (CommandList children: [ (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:test_description) op: Equal rhs: {(SQ <"git-svn svk merge tickets">)} spids: [13] ) ] spids: [13] ) (C {(.)} {(./lib-git-svn.sh)}) (C {(test_expect_success)} {(SQ <"load svk depot">)} { (DQ ("\n") ("\tsvnadmin load -q '") ($ VSub_Name "$rawsvnrepo") ("' ") ("\t < '") ($ VSub_Name "$TEST_DIRECTORY") ("/t9150/svk-merge.dump' &&\n") ("\tgit svn init --minimize-url -R svkmerge ") ("\t --rewrite-root=http://svn.example.org ") ("\t -T trunk -b branches '") ($ VSub_Name "$svnrepo") ("' &&\n") ("\tgit svn fetch --all\n") ("\t") ) } ) (Assignment keyword: Assign_None pairs: [ (assign_pair lhs: (LhsName name:uuid) op: Equal rhs: {(b48289b2-9c08-4d72-af37-0358a40b9c15)} spids: [51] ) ] spids: [51] ) (C {(test_expect_success)} {(SQ <"svk merges were represented coming in">)} { (DQ ("\n") ("\t[ ") (CommandSubPart command_list: (CommandList children: [ (Pipeline children: [ (C {(git)} {(cat-file)} {(commit)} {(HEAD)}) (C {(grep)} {(parent)}) (C {(wc)} {(-l)}) ] negated: False ) ] ) left_token: spids: [64 84] ) (" -eq 2 ]\n") ("\t") ) } ) (C {(test_done)}) ] )