diff options
| author | Eric Wong <normalperson@yhbt.net> | 2007-02-09 09:28:30 (GMT) |
|---|---|---|
| committer | Eric Wong <normalperson@yhbt.net> | 2007-02-23 08:57:11 (GMT) |
| commit | b9dffd8cad737a07d6a05503318c6746ac593f9c (patch) | |
| tree | 735ee41949d15fb6b0d42b13a90e6834dbe800f9 /t/t9104-git-svn-follow-parent.sh | |
| parent | e518192f3be92097ba550098dbb69d769ca18429 (diff) | |
| download | git-b9dffd8cad737a07d6a05503318c6746ac593f9c.zip git-b9dffd8cad737a07d6a05503318c6746ac593f9c.tar.gz git-b9dffd8cad737a07d6a05503318c6746ac593f9c.tar.bz2 | |
git-svn: --follow-parent tracks multi-parent paths
We can have a branch that was deleted, then re-added under the
same name but copied from another path, in which case we'll have
multiple parents (we don't want to break the original ref, nor
lose copypath info).
Add a test for this, too, of course.
Signed-off-by: Eric Wong <normalperson@yhbt.net>
Diffstat (limited to 't/t9104-git-svn-follow-parent.sh')
| -rwxr-xr-x | t/t9104-git-svn-follow-parent.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/t/t9104-git-svn-follow-parent.sh b/t/t9104-git-svn-follow-parent.sh index eebb849..f5b7e5e 100755 --- a/t/t9104-git-svn-follow-parent.sh +++ b/t/t9104-git-svn-follow-parent.sh @@ -146,6 +146,13 @@ test_expect_success "track initial change if it was only made to parent" " \"\`git rev-parse r9270-d~1\`\" " +test_expect_success "track multi-parent paths" " + svn cp -m 'resurrect /glob' $svnrepo/r9270 $svnrepo/glob && + git-svn multi-fetch --follow-parent && + test \`git cat-file commit refs/remotes/glob | \ + grep '^parent ' | wc -l\` -eq 2 + " + test_expect_success "multi-fetch continues to work" " git-svn multi-fetch --follow-parent " |