Comment 8 for bug 332116

Is this because the parents of the round-tripped revisions have already been
recorded using the old mapping?

It does make it hard to merge from one branch to the other though. I suppose I
could just do a cherrypick merge or replay the revisions, but that feels so...
dirty. Also, when I tried both of those (merge, replay), they both gave
conflicts on everything. I assume this was because none of the files shared
the same IDs... ? Any suggestions?

A thought on svn-upgrade: when upgrading round-tripped revisions which have
ancestors with an old mapping, perhaps we should "convert" that round-tripped
revision to a "dumb" svn-mapped revision (albeit, perhaps with multiple
parents, and whatever other bzr props can still be ascertained from the old
round-tripped revision). So, for example, the top four revisions in the
rails_2_2 branch would change from:

svn-v4:0487d25d-142b-0410-8fcf-b82ac621bf97:plugins/spice/branches/rails_2_2:53310
<email address hidden>
<email address hidden>
svn-v3-trunk2:0487d25d-142b-0410-8fcf-b82ac621bf97:plugins%2Fspice%2Fbranches%2Frails_2_2:50561

to:

svn-v4:0487d25d-142b-0410-8fcf-b82ac621bf97:plugins/spice/branches/rails_2_2:53310
svn-v4:0487d25d-142b-0410-8fcf-b82ac621bf97:plugins/spice/branches/rails_2_2:50573
svn-v4:0487d25d-142b-0410-8fcf-b82ac621bf97:plugins/spice/branches/rails_2_2:50563
svn-v4:0487d25d-142b-0410-8fcf-b82ac621bf97:plugins/spice/branches/rails_2_2:50561

Then (I assume) there might not need to be another core bzr change to
facilitate this. What do you think? Is that possible or worthwhile?

Thanks!