Reputation: 8968
I'm trying to understand why the below is occuring:
alt text http://img185.imageshack.us/img185/8301/capturexj.png
It appears that I have started another branch, but it has no name, and I do not remember creating a new branch. Why did this new head(branch) get created? How do I keep it from happening?
Upvotes: 2
Views: 124
Reputation: 10918
This will happen if you update your working directory to an earlier revision and start making changes from there. After the "fix broken link" commit, you did a hg update
that brought you back to the "secondary address update" revision.
It's easily fixed by first making sure that your working directory is at the tip then hg merge -r fix_broken_link
Upvotes: 2