Sign Up to our social questions and Answers Engine to ask questions, answer people’s questions, and connect with other people.
Login to our social questions & Answers Engine to ask questions answer people’s questions & connect with other people.
Lost your password? Please enter your email address. You will receive a link and will create a new password via email.
Please briefly explain why you feel this question should be reported.
Please briefly explain why you feel this answer should be reported.
Please briefly explain why you feel this user should be reported.
I have pulled an incoming changes from a codeplex-based mercurial repository and have arrived at the following branches graph:
Last changes were pushed to the repo by me from another machine.
Why do I have a graph branch from default to default?
You made revision 14 on one machine and also made revision 15 on another machine. When you pulled from the central repo, you got the changes that were made on the other machine as an anonymous branch of
default. The solution, using tortoisehg, would be to right click on revision 14 and select Merge with local.This is the same as it would have happened if another author made those changes and will happen every time you do work on one machine without pulling the changes made on the other machine.
If you want to avoid this in the future, then you should commit and push your changes when you know that you’re going to switch computers and then pull and update on the other computer before you start work on it (although there’s no problem not doing it other than the fact that you won’t have changes that you might need when you switch computers)