From: Eric Wong <normalperson@yhbt.net>
Date: Fri, 9 Feb 2007 09:28:30 +0000 (-0800)
Subject: git-svn: --follow-parent tracks multi-parent paths
X-Git-Tag: v1.5.1-rc1~187
X-Git-Url: https://git.lorimer.id.au/gitweb.git/diff_plain/b9dffd8cad737a07d6a05503318c6746ac593f9c?hp=b9dffd8cad737a07d6a05503318c6746ac593f9c

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>
---