python-boto parallel import repair

[Max Bowsher]

We would like to tidy up the python-boto branches to remove a manual parallel import which complicates the history and file-ids unnecessarily. To that end, I request the following on jubany:

# Remove revisions after the problem ones
for i in lucid maverick natty oneiric; do bzr push --overwrite -d bzr+ssh://bazaar.launchpad.net/+branch/ubuntu/karmic/python-boto bzr+ssh://bazaar.launchpad.net/+branch/ubuntu/$i/python-boto; done

# Clean up tags pointing at removed revisions:
for i in lucid maverick natty oneiric; do
for tag in 1.9b-1 1.9b-2 1.9b-1ubuntu{1,2,3,4,5} upstream-1.9b; do
bzr tag --delete -d bzr+ssh://bazaar.launchpad.net/+branch/ubuntu/$i/python-boto $tag
done
done
# (Not all tags present in all branches, expect a few tag not found errors)

# Requeue
./requeue_package.py --force --full python-boto

[Vincent Ladeuil (vila)]

For the record:

$ for i in lucid maverick natty oneiric; do bzr push --overwrite -d bzr+ssh://bazaar.launchpad.net/+branch/ubuntu/karmic/python-boto bzr+ssh://bazaar.launchpad.net/+branch/ubuntu/$i/python-boto; done
Pushed up to revision 10.
Pushed up to revision 10.
Pushed up to revision 10.
Pushed up to revision 10.

$ for i in lucid maverick natty oneiric; do
> for tag in 1.9b-1 1.9b-2 1.9b-1ubuntu{1,2,3,4,5} upstream-1.9b; do
> bzr tag --delete -d bzr+ssh://bazaar.launchpad.net/+branch/ubuntu/$i/python-boto $tag
> done
> done
Deleted tag 1.9b-1.
Deleted tag 1.9b-2.
Deleted tag 1.9b-1ubuntu1.
Deleted tag 1.9b-1ubuntu2.
Deleted tag 1.9b-1ubuntu3.
bzr: ERROR: No such tag: 1.9b-1ubuntu4
bzr: ERROR: No such tag: 1.9b-1ubuntu5
Deleted tag upstream-1.9b.
Deleted tag 1.9b-1.
Deleted tag 1.9b-2.
Deleted tag 1.9b-1ubuntu1.
Deleted tag 1.9b-1ubuntu2.
Deleted tag 1.9b-1ubuntu3.
bzr: ERROR: No such tag: 1.9b-1ubuntu4
bzr: ERROR: No such tag: 1.9b-1ubuntu5
Deleted tag upstream-1.9b.
Deleted tag 1.9b-1.
Deleted tag 1.9b-2.
Deleted tag 1.9b-1ubuntu1.
Deleted tag 1.9b-1ubuntu2.
Deleted tag 1.9b-1ubuntu3.
Deleted tag 1.9b-1ubuntu4.
Deleted tag 1.9b-1ubuntu5.
Deleted tag upstream-1.9b.
Deleted tag 1.9b-1.
Deleted tag 1.9b-2.
Deleted tag 1.9b-1ubuntu1.
Deleted tag 1.9b-1ubuntu2.
Deleted tag 1.9b-1ubuntu3.
Deleted tag 1.9b-1ubuntu4.
Deleted tag 1.9b-1ubuntu5.
Deleted tag upstre...

[Max Bowsher (maxb)]

I have no idea how it managed to do this, but the unwanted revisions are somehow still there.

[Max Bowsher (maxb)]

Last go around, I failed to note that the debian branches need doctoring as well as the ubuntu ones.

I *WAS* going to suggest this updated recipe...

# Remove revisions after the problem ones
for i in lucid maverick natty oneiric; do
  bzr uncommit --force -r 1.8d-1ubuntu2 bzr+ssh://bazaar.launchpad.net/+branch/ubuntu/$i/python-boto
done
for i in squeeze wheezy sid; do
  bzr uncommit --force -r 1.8d-1 bzr+ssh://bazaar.launchpad.net/+branch/debian/$i/python-boto
done

# Clean up tags pointing at removed revisions:
for i in lucid maverick natty oneiric; do
  for tag in 1.9b-1 1.9b-2 1.9b-3 1.9b-4 1.9b-1ubuntu1 1.9b-1ubuntu2 \
    1.9b-1ubuntu3 1.9b-1ubuntu4 1.9b-1ubuntu5 upstream-1.9b; do
    bzr tag --delete -d bzr+ssh://bazaar.launchpad.net/+branch/ubuntu/$i/python-boto $tag
  done
done
for i in squeeze wheezy sid; do
  for tag in 1.9b-1 1.9b-2 1.9b-3 1.9b-4 1.9b-1ubuntu1 1.9b-1ubuntu2 \
    1.9b-1ubuntu3 1.9b-1ubuntu4 1.9b-1ubuntu5 upstream-1.9b; do
    bzr tag --delete -d bzr+ssh://bazaar.launchpad.net/+branch/debian/$i/python-boto $tag
  done
done
# (Not all tags present in all branches, expect a few tag not found errors)

# Requeue
./requeue_package.py --force --full python-boto

*BUT* on testing it discovered that whilst it pruned the odd import I has assumed was the culprit, the problem actually goes back to the importer unnecessarily forking the file-ids for new files back in the intrepid / squeeze era.

I now think the most expedient solution to producing a pleasant-to-work-with history here would be to delete_branches_from_lp and redo the import completely.

[Max Bowsher (maxb)]

Although even that doesn't produce a completely consistent set of file-ids - but at least only the root id is different then.