I am learning mercurial, and I went to make some changes, and I received the message according to the “created new head” - although I could swear that I did hg pull and hg update before I did a new job.
Then I got confused, so I did a merge to try to get out of the mess. The only file I'm working on is fine (again, I use only one file when I try to learn HG). I can’t post my image (not enough points), but I tried to recreate it below.
When I created the tag seo_v_1.0, did I automatically create a branch? In other hg repositories, I just create a tag, push the changes and keep moving.
Can someone help me decrypt what I did here? The only change I made to the repo before the merger was that I made the shift “to 33”. So, maybe, according to my diagram below, I was already in the branch, but did not know this? Did the seo_v_1.0 tag unintentionally create a branch?
Thanks in advance.
Notice that the line starts with "seo_v_1.0" before the "added tag ..", and the line goes back to "up to 33" for the "default merge item"
- default merge thing [it's yellow] [and default is green]
- up to 33
- added tag seo_v_1.1 for changeet xxxx
- seo_v1.1 peeled colors [it's yellow]
- added tag seo_v_1.0 for changeet xxxx
- seo_v_1.0-completed [it's yellow]
- seo through section 2
- seo cross reference done
- initial fixation
: glog output
@ changeset: 9:8637aa6d738f
|\ tag: tip
| | parent: 8:
| | parent: 7:
| |
| | summary: merge thing
| |
| o changeset: 8:
| | parent: 4:
| |
| | summary: up to 33
| |
o | changeset: 7:
| |
| | summary: Added tag seo_v_1.1 for changeset de5f8c81840f
| |
o | changeset: 6:
| | tag: seo_v_1.1
| |
| |
| | summary: cleared left col colors
| |
o | changeset: 5:
|/
|
| summary: Added tag seo_v_1.0 for changeset c13bd5d3cc09
| o changeset: 4:
| tag: seo_v_1.0
|
| summary: -completed cross-reference