hg-merge

How to correctly close a feature branch in Mercurial?

谁说我不能喝 提交于 2019-11-29 18:32:23
I've finished working on a feature branch feature-x . I want to merge results back to the default branch and close feature-x in order to get rid of it in the output of hg branches . I came up with the following scenario, but it has some issues: $ hg up default $ hg merge feature-x $ hg ci -m merge $ hg up feature-x $ hg ci -m 'Closed branch feature-x' --close-branch So the feature-x branch (changests 40 - 41 ) is closed, but there is one new head , the closing branch changeset 44 , that will be listed in hg heads every time: $ hg log ... o 44 Closed branch feature-x | | @ 43 merge |/| | o 42

How to correctly close a feature branch in Mercurial?

ぐ巨炮叔叔 提交于 2019-11-28 13:08:32
问题 I've finished working on a feature branch feature-x . I want to merge results back to the default branch and close feature-x in order to get rid of it in the output of hg branches . I came up with the following scenario, but it has some issues: $ hg up default $ hg merge feature-x $ hg ci -m merge $ hg up feature-x $ hg ci -m 'Closed branch feature-x' --close-branch So the feature-x branch (changests 40 - 41 ) is closed, but there is one new head , the closing branch changeset 44 , that will