diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2011-11-23 13:28:53 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2011-11-23 13:28:53 -0800 |
| commit | 3686aa1caf907d22fe318c28efe93f0e7870ba50 (patch) | |
| tree | f99a303bd14c7343be7ccc5b9df5382f1bf79246 /t/t9111-git-svn-use-svnsync-props.sh | |
| parent | imap-send: Remove unused 'use_namespace' variable (diff) | |
| parent | documentation fix: git difftool uses diff tools, not merge tools. (diff) | |
| download | tgif-3686aa1caf907d22fe318c28efe93f0e7870ba50.tar.xz | |
Merge branch 'maint' into tj/imap-send-remove-unused
* maint: (18123 commits)
documentation fix: git difftool uses diff tools, not merge tools.
Git 1.7.7.4
Makefile: add missing header file dependencies
notes merge: eliminate OUTPUT macro
mailmap: xcalloc mailmap_info
name-rev --all: do not even attempt to describe non-commit object
Git 1.7.7.3
docs: Update install-doc-quick
docs: don't mention --quiet or --exit-code in git-log(1)
Git 1.7.7.2
t7511: avoid use of reserved filename on Windows.
clone: Quote user supplied path in a single quote pair
read-cache.c: fix index memory allocation
make the sample pre-commit hook script reject names with newlines, too
Reindent closing bracket using tab instead of spaces
Git 1.7.7.1
RelNotes/1.7.7.1: setgid bit patch is about fixing "git init" via Makefile setting
gitweb: fix regression when filtering out forks
Almost ready for 1.7.7.1
pack-objects: don't traverse objects unnecessarily
...
Conflicts:
imap-send.c
Diffstat (limited to 't/t9111-git-svn-use-svnsync-props.sh')
| -rwxr-xr-x | t/t9111-git-svn-use-svnsync-props.sh | 51 |
1 files changed, 51 insertions, 0 deletions
diff --git a/t/t9111-git-svn-use-svnsync-props.sh b/t/t9111-git-svn-use-svnsync-props.sh new file mode 100755 index 0000000000..bd081c2ec3 --- /dev/null +++ b/t/t9111-git-svn-use-svnsync-props.sh @@ -0,0 +1,51 @@ +#!/bin/sh +# +# Copyright (c) 2007 Eric Wong +# + +test_description='git svn useSvnsyncProps test' + +. ./lib-git-svn.sh + +test_expect_success 'load svnsync repo' ' + svnadmin load -q "$rawsvnrepo" < "$TEST_DIRECTORY"/t9111/svnsync.dump && + git svn init --minimize-url -R arr -i bar "$svnrepo"/bar && + git svn init --minimize-url -R argh -i dir "$svnrepo"/dir && + git svn init --minimize-url -R argh -i e "$svnrepo"/dir/a/b/c/d/e && + git config svn.useSvnsyncProps true && + git svn fetch --all + ' + +uuid=161ce429-a9dd-4828-af4a-52023f968c89 + +bar_url=http://mayonaise/svnrepo/bar +test_expect_success 'verify metadata for /bar' " + git cat-file commit refs/remotes/bar | \ + grep '^${git_svn_id}: $bar_url@12 $uuid$' && + git cat-file commit refs/remotes/bar~1 | \ + grep '^${git_svn_id}: $bar_url@11 $uuid$' && + git cat-file commit refs/remotes/bar~2 | \ + grep '^${git_svn_id}: $bar_url@10 $uuid$' && + git cat-file commit refs/remotes/bar~3 | \ + grep '^${git_svn_id}: $bar_url@9 $uuid$' && + git cat-file commit refs/remotes/bar~4 | \ + grep '^${git_svn_id}: $bar_url@6 $uuid$' && + git cat-file commit refs/remotes/bar~5 | \ + grep '^${git_svn_id}: $bar_url@1 $uuid$' + " + +e_url=http://mayonaise/svnrepo/dir/a/b/c/d/e +test_expect_success 'verify metadata for /dir/a/b/c/d/e' " + git cat-file commit refs/remotes/e | \ + grep '^${git_svn_id}: $e_url@1 $uuid$' + " + +dir_url=http://mayonaise/svnrepo/dir +test_expect_success 'verify metadata for /dir' " + git cat-file commit refs/remotes/dir | \ + grep '^${git_svn_id}: $dir_url@2 $uuid$' && + git cat-file commit refs/remotes/dir~1 | \ + grep '^${git_svn_id}: $dir_url@1 $uuid$' + " + +test_done |