diff options
| author | Martin Langhoff <martin@catalyst.net.nz> | 2006-06-11 20:12:09 +1200 |
|---|---|---|
| committer | Junio C Hamano <junkio@cox.net> | 2006-06-16 22:45:11 -0700 |
| commit | 71b08148366bbc4d02b3477e7ded35b049206f89 (patch) | |
| tree | c53dc8fb7a8ee8dd311ec24c9f37d02fdb947f2c /merge-tree.c | |
| parent | b19ee24b22b3c1d08f06e8f868f11d9e8639fd30 (diff) | |
| download | git-71b08148366bbc4d02b3477e7ded35b049206f89.tar.gz git-71b08148366bbc4d02b3477e7ded35b049206f89.tar.xz | |
cvsimport: ignore CVSPS_NO_BRANCH and impossible branches
cvsps output often contains references to CVSPS_NO_BRANCH, commits
that it could not trace to a branch. Ignore that branch.
Additionally, cvsps will sometimes draw circular relationships
between branches -- where two branches are recorded as opening
from the other. In those cases, and where the ancestor branch
hasn't been seen, ignore it.
Signed-off-by: Martin Langhoff <martin@catalyst.net.nz>
Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'merge-tree.c')
0 files changed, 0 insertions, 0 deletions