| Sam Vilain | f1264bd | 2009-10-20 15:42:01 +1300 | [diff] [blame] | 1 | #!/bin/sh |
| 2 | # |
| 3 | # Copyright (c) 2007 Sam Vilain |
| 4 | # |
| 5 | |
| 6 | test_description='git-svn svk merge tickets' |
| 7 | |
| 8 | . ./lib-git-svn.sh |
| 9 | |
| 10 | test_expect_success 'load svk depot' " |
| Jeff King | 15c6bf0 | 2009-10-30 16:10:17 -0400 | [diff] [blame] | 11 | svnadmin load -q '$rawsvnrepo' \ |
| 12 | < '$TEST_DIRECTORY/t9150/svk-merge.dump' && |
| Sam Vilain | f1264bd | 2009-10-20 15:42:01 +1300 | [diff] [blame] | 13 | git svn init --minimize-url -R svkmerge \ |
| Tuomas Suutari | 95109f2 | 2010-02-24 20:09:02 +0200 | [diff] [blame] | 14 | --rewrite-root=http://svn.example.org \ |
| Sam Vilain | f1264bd | 2009-10-20 15:42:01 +1300 | [diff] [blame] | 15 | -T trunk -b branches '$svnrepo' && |
| 16 | git svn fetch --all |
| 17 | " |
| 18 | |
| 19 | uuid=b48289b2-9c08-4d72-af37-0358a40b9c15 |
| 20 | |
| 21 | test_expect_success 'svk merges were represented coming in' " |
| Matthew Ogilvie | 5d59a40 | 2009-11-28 11:38:55 -0700 | [diff] [blame] | 22 | [ `git cat-file commit HEAD | grep parent | wc -l` -eq 2 ] |
| Sam Vilain | f1264bd | 2009-10-20 15:42:01 +1300 | [diff] [blame] | 23 | " |
| 24 | |
| 25 | test_done |
