Mercurial - close default branch and replace with a named branch as new default

前端 未结 3 1650
暗喜
暗喜 2021-01-31 20:11

In a mercurial repo, the \"default\" branch has fallen very out of date to the point where it no longer makes sense to merge in the changes from \"develop\", a named branch whic

3条回答
  •  执念已碎
    2021-01-31 20:57

    I think it is better to use a concept in Tortoisehg to explain how it works.

    • hg update to develop branch
    • choose the head of default branch, and choose merge with local
    • then choose discard all changes from merge target (other), thus default is merged into develop without affecting the develop
    • then branch to default from the head of develop, use hg branch default, default restarts again

提交回复
热议问题