mirror of
https://github.com/git/git.git
synced 2024-11-17 14:34:49 +01:00
f1264bd654
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>
23 lines
500 B
Bash
23 lines
500 B
Bash
#!/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' < '../t9150/svk-merge.dump' &&
|
|
git svn init --minimize-url -R svkmerge \
|
|
-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
|