So I started down a new branch of development and decided that some files needed to go.
Several commits later I realise that a certain decision was wrong and I need a couple of the files back.
My initial thought of how to get the files back is to just take copies from the other branch and commit them to the head of the new branch, but I worry that this means that the files won't be associated with their old history.
Is there a way to do this that keeps the history intact?
I'm using mercurial version 1.5.2