Geek asks and answers

Get default patch to function branch in Mercurial

How to get the fix that I made in the default branch to the named branch in mercurial? I recently started working on a new function, so I thought that I would do this work in a branch (which I did not do before), so I could save the changes from the main branch by default until I finish working on them and this function is ready for deployment . The idea was that I could upgrade to the default branch and apply any fixes as needed.

Tortoise hg branching

Now I want to get a fix in my named branch. The tip (rev 739) has a change that I want to include in the BoardSummary branch. I know that I can join, but I do not want to make BoardSummary changes to the default branch.

mercurial: named to dev branch, .

. " , changeet 2 ", 732 ( ). , , . 738 ? , 739 - BoardSummary. , , " " - ,

+5
2

, , BoardSummary. BoardSummary, . , BoardSummary , BoardSummary .

:

$ hg up BoardSummary
$ hg merge default
$ hg commit -m "Merge the fix for #247"

, . :

  • () ,
  • default (master, trunk), ,
  • , , .

, , - . , , .

, new-dal ( ). ( ), 1.0. , , (1.0-stable → default → new-dal), .

- Mercurial: " " : .

BoardSummary, , , . , .

+7

/ 739 ( ) . r732. r739. :

  r329
    |
--r232-----default branch
       \
        \
         feature branch

(r329) . .

0

More articles:


All Articles