Incremental hg convert - switching subversion sources

[Paul Moore]

On 01/04/2008, Bryan O'Sullivan <bos at serpentine.com> wrote:
> Paul Moore wrote:
>
>  > Is this possible, in any way?
>
> It should work if you fix up the UUID and path of the SVN tree in the
>  .hg/shamap file in your converted hg tree.  You can find the UUID using
>  "svn info".

Excellent, I'll do some experimenting.

On a somewhat unrelated note, while I was experimenting the other day,
I managed to mess up a conversion (basically by reverting out some
revisions, but not fixing the shamap so they didn't get pulled again,
then trying to fix things and flailing about randomly :-)). What I
ended up with was a nearly-correct tree with a "side branch".
Something like this:

1 -> 2 -> 3 -> 4 -> 5 -> 6 -> 7
        \
	 -> 3a -> 4a

Here, 3a and 4a are identical to 3 and 4. Is there any way to "prune"
the side branch? (I know this is history editing, which is not really
possible, but if I can't tidy up the history, I've no real objection
to leaving it in and just merging in, as long as I can carry on with
the incremental conversions...)

Paul.