Important changes to forums and questions
All forums and questions are now archived. To start a new conversation or read the latest updates go to forums.mbed.com.
10 years, 10 months ago.
How to remove tags from revision comment line?
Around rev97, the "default" tag that used to show up on the most recent rev got replaced with a "metric" tag. I use the term tag but this is something different than the tags that you add when you publish (those don't show up in the revision comments like these do). I am trying to figure out how to remove the "metric" tag and restore "default" to the pole position. How are these managed?
This is a like to my history showing the problem: http://mbed.org/users/TickTock/code/CANary/shortlog
1 Answer
10 years, 10 months ago.
Ok,
Those tags are actually mercurial branch names - http://stevelosh.com/blog/2009/08/a-guide-to-branching-in-mercurial/
You can see the branches if you switch to Graph view on the repository. What you effectively want to do is end the current branch, and merge it back into 'default'. Unfortunately, we do not yet have full branching support, which makes an already complicated topic a bit more tricky.
However, you can do it. In the compiler, switch your program to the last commit in the default branch. . Highlight the one you want to switch to (Revision 64 in your repo) and press 'Switch'.
Then, select the last commit in the 'metric' branch, and press 'Merge'. You will need to resolve some conflicts manually. (Search for >>> in the highlighted files)
Finally, press 'Commit', and enter a message like 'merge'. You will then hopefully see the graph display within the IDE reflect the fact that your Metric branch is now joined with your Default branch, and therefore Default is now the latest branch.
Carefully verify your program works as it should before publishing. If something went wrong, you can just re-import your program to start again.
Hope that helps!
Dan
Hellooooo
posted by Tick Tock 21 Jul 2013