cheche
April 26, 2024, 5:28am
1
I am a bit lost with hg.
I have create 2 topics:
topic/default/section-anchors-for-configuration-doc
topic/default/link-email-settings-on-notification-email-docs
In the second topic there is a commit that should not be there…
I found this instruccions:
Hi,
Sometimes, I forget some hg commands.
Here’s a small cheat sheet with the most used hg commands to deal with Tryton/Heptapod.
Octobus
Heptapod – Merge Request Quick Start Guide
Commands
Cloning Tryton Repo:
hg clone ssh://hg@foss.heptapod.net/tryton/tryton
Updating Tryton Repo:
hg update
Listing topics:
hg topics
Create new Topic:
hg topic <topic-name>
Switching into Topic:
hg update <topic-name>
You must rebase your topic on top of default branch. Can be done with:
hg pull …
So I realize that I should rebase before creating the second topic.
I execute:
hg update link-email-settings-on-notification-email-docs
hg rebase -d default
But still 2 commits in that topic…
cheche
April 26, 2024, 5:34am
2
hg stack
### topic: link-email-settings-on-notification-email-docs (2 heads)
### target: 6.8+default (branch), 1180 behind
s2: Improve notification docs adding a link to email settings
^ Increase version number
s1@ Improve notification docs adding a link to email settings (current)
s0^ Add section anchors to the configuration document. (base)
ced
(Cédric Krier)
April 26, 2024, 6:49am
3
To remove a commit from a topic, you can use hg prune -r <rev>
. Often it is needed to solve the topic with hg evolve
.
cheche
April 26, 2024, 8:00am
4
ok. That seems to work. I hope that I did not break anything else…