Hi, I'm using source tree, mercurial is my DVCS, and I'm using a Mac.
I have made changes to my code in my local repository that I don't want to keep. I haven't committed any of these changes. I essentially want to scrap the day and pretend it never happened. I'm having trouble finding what each of the functions actually do in source tree. Again, I don't want to scrap my whole branch, just the uncommitted changes to my working copy, and go back to where I was at the beginning of the day, which is the last committed change.
So far I've highlighted the uncommitted changes and selected "discard" in order to, well, discard them. The “tip” of the “branch” is now the previous committed version, great.
Here is my problem: the uncommitted changes are still present in the “history” and the “file status” areas of my workspace. If I right click, relevant actions seems to be “add” “ignore” and “remove”. I’m thinking that the discarded changes are in some kind of limbo, and I need to do something with them. “add” would be to pull that file back into the history, “ignore” would keep the file on my local repository but would stop “tracking” it, i.e., it would stay in my folder but wouldn’t get “pushed” into the remote repository, and “remove” would delete “uncommitted changes” file, without messing with other parts of the branch. Is this right? In this case I believe I want to "remove".
After that, I want to get my "working copy” in my local repository back to where I was in the beginning of the day. To do this, do I highlight the version I was happy with, right click, and select “revert to revision”?
Thanks for your time!