[Debian-ha-maintainers] Cleaning up the 4d0a86f88f35 mess

[Florian Haas]

Frederik,

as discussed on IRC, here's how you resolve the botched 4d0a86f88f35
merge on alioth.

[To all others: we decided that rather than backing out this screwup,
considering the limited number of people affected, it's best to rewrite
the commit history in the upstream repo. Everyone will have to repull
after this.]

1. Log on to alioth and open the cluster-agents repo.

2. Do "hg strip a5d9e985d169". This will eradicate the botched commit
from history. (That's the commit that precedes 4d0a86f88f35, which is
itself broken. hg strip will remove both).

3. Open your local checkout.

4. Do "hg strip a5d9e985d169" there too.

5. Check with "hg branch" that you are in the sid branch.

6. Now your newest commit in the sid branch (as per hg heads) should be
commit 062d64f73a5f (Martin's last merge with default).

7. Do "hg update -C sid" to be sure you don't have any local pending
changes.

8. Do "hg pull upstream -r default" to fetch the newest changes from
upstream. At the time I am writing, "hg heads" would show commit
cccd602a1e29 as the latest commit in upstream.

9. Do "hg merge default".

10. Do "hg commit -m 'Merge with upstream'

11. Add your debian/copyrights changes.

12. Do "hg commit", adding a meaningful commit message.

13. Add any other changes you have to debian packaging at this point,
using a commit for each change.

14. Do "hg outgoing debian -r sid". You should have at least three
outgoing patches: the merge with upstream, the most recent fix in
upstream, and your debian/copyrights fix. Plus any other commits on top
of that.

15. Do "hg push debian". This should now be a clean push into the debian
repo which does not create any new remote heads. It should update two
branches in the debian repo: default and sid.

16. Inform everyone else that you are done, that they should also strip
062d64f73a5f from their local checkouts, and then repull the sid branch
into their local checkout.

Hope this helps.

Florian

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 260 bytes
Desc: OpenPGP digital signature
URL: <http://lists.alioth.debian.org/pipermail/debian-ha-maintainers/attachments/20100323/d39b5ef7/attachment.pgp>