Ancestry WIP
Ancestry WIP
More Ancestry WIP
Clear pending merges after reporting them
Factor out ancestry recording

We'll need it for dealing with SVN merges
First attempt to write merge info

This one doesn't work because git-fast-import requires that
information to appear at the beginning of a commit.
Factor out SVN directory traversal

We'll need this so we can discover merges in a separate pass
Write ancestry information to the right part of the git-fast-import stream
Merge remote-tracking branch 'origin/rewrite' into rewrite