git/t/t9150-svk-mergetickets.sh

#!/bin/sh
#
# Copyright (c) 2007 Sam Vilain
#

test_description='git-svn svk merge tickets'

. ./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
	"

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
git-svn: convert SVK merge tickets to extra parents SVK is a simple case to start with, as its idea of merge parents matches git's one. When a svk:merge ticket is encountered, check each of the listed merged revisions to see if they are in the history of this commit; if not, then we have encountered a merge - record it. [ew: minor formatting cleanups] Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Acked-by: Eric Wong <normalperson@yhbt.net> 2009-10-20 02:42:01 +00:00			`#!/bin/sh`
			`#`
			`# Copyright (c) 2007 Sam Vilain`
			`#`

			`test_description='git-svn svk merge tickets'`

			`. ./lib-git-svn.sh`

			`test_expect_success 'load svk depot' "`
t915{0,1}: use $TEST_DIRECTORY Because --root can put our trash directories elsewhere, using ".." may not always work. Signed-off-by: Jeff King <peff@peff.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-10-30 20:10:17 +00:00			`svnadmin load -q '$rawsvnrepo' \`
			`< '$TEST_DIRECTORY/t9150/svk-merge.dump' &&`
git-svn: convert SVK merge tickets to extra parents SVK is a simple case to start with, as its idea of merge parents matches git's one. When a svk:merge ticket is encountered, check each of the listed merged revisions to see if they are in the history of this commit; if not, then we have encountered a merge - record it. [ew: minor formatting cleanups] Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Acked-by: Eric Wong <normalperson@yhbt.net> 2009-10-20 02:42:01 +00:00			`git svn init --minimize-url -R svkmerge \`
t9150,t9151: Add rewrite-root option to init The rewrite-root option seems to be a bit problematic with merge detecting, so it's better to have a merge detecting test with it turned on. Signed-off-by: Tuomas Suutari <tuomas.suutari@gmail.com> Acked-by: Eric Wong <normalperson@yhbt.net> 2010-02-24 18:09:02 +00:00			`--rewrite-root=http://svn.example.org \`
git-svn: convert SVK merge tickets to extra parents SVK is a simple case to start with, as its idea of merge parents matches git's one. When a svk:merge ticket is encountered, check each of the listed merged revisions to see if they are in the history of this commit; if not, then we have encountered a merge - record it. [ew: minor formatting cleanups] Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Acked-by: Eric Wong <normalperson@yhbt.net> 2009-10-20 02:42:01 +00:00			`-T trunk -b branches '$svnrepo' &&`
			`git svn fetch --all`
			`"`

			`uuid=b48289b2-9c08-4d72-af37-0358a40b9c15`

			`test_expect_success 'svk merges were represented coming in' "`
t3409 t4107 t7406 t9150: use dashless commands This is needed to allow test suite to run against a standard install bin directory instead of GIT_EXEC_PATH. Signed-off-by: Matthew Ogilvie <mmogilvi_git@miniinfo.net> Signed-off-by: Junio C Hamano <gitster@pobox.com> 2009-11-28 18:38:55 +00:00			[ `git cat-file commit HEAD \| grep parent \| wc -l` -eq 2 ]
git-svn: convert SVK merge tickets to extra parents SVK is a simple case to start with, as its idea of merge parents matches git's one. When a svk:merge ticket is encountered, check each of the listed merged revisions to see if they are in the history of this commit; if not, then we have encountered a merge - record it. [ew: minor formatting cleanups] Signed-off-by: Sam Vilain <sam.vilain@catalyst.net.nz> Acked-by: Eric Wong <normalperson@yhbt.net> 2009-10-20 02:42:01 +00:00			`"`

			`test_done`