Tip:
If you'd like to drastically reduce the diff, while achieving the same effect:
Revert back to 86: bzr uncommit && bzr revert
Then bzr mv hooks/charmhelpers instead of mv, and do your linking after that. This will keep the version control side of things happier.
Then commit and bzr push with --overwrite.
« Back to merge proposal
Tip:
If you'd like to drastically reduce the diff, while achieving the same effect:
Revert back to 86: bzr uncommit && bzr revert
Then bzr mv hooks/charmhelpers instead of mv, and do your linking after that. This will keep the version control side of things happier.
Then commit and bzr push with --overwrite.