I'm having a repository
A with local changes which are very similar to the changes commited to repository
To keep things simple, lets say the local changes are in file
While in repository
A, I pulled from repository
hg pull http://B_url:8000
And then I did, with local changes in the working directory
Please note the history is linear,
hg heads contains only one tip, since I never committed anything to
A has only local changes to the working directory.
Mercurial, as it should, warned about conflicts in file
a now contains the
>>>> known signs for conflict.
I want to revert file
a to the local version it had before the update. How can I do that with Mercurial? It's not in any revision now, it was just a local change.