All geek questions in one place

Mercurial: Merging between branches ... Forward?

Situation: I am new to Mercurial. I recently installed and started using the repository in the model recommended to me (see the Rudi Diagram below). Everything is going well, but I ran into the first problem of practical application. Mercurial seems to be transition / merged oriented, and I would like to make a backup. I want to clear our default and stable branch, starting from the supplier branch, re-make the changes and check it as default. Then combine this into a stable one.

V1----V2-------------V3---------V4     Vendor
 \     \              \          \
  D1----D2---D3--D4-D5-D6-D7-D8---D9   default
                  \           \    \
                   S1----------S2---S3 stable

Question: How to start from the supplier branch as a parent, merge the default changes and pass them to the default branch?

I thought the following would do it, but the update would change the working directory.

hg update -C vendor
hg update default
hg merge
+3
2

. . :

hg update default
hg --config ui.merge=internal:other merge vendor

, , , , - , ( ) , .

:

hg update -C vendor
hg debugsetparent default
hg commit

debugsetparent - powertool, .

+4

, , Mercurial Wiki.

0

Source: https://habr.com/ru/post/1772527/

More articles:


All Articles