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

前端 未结 3 1689
暗喜
暗喜 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:55

    Based on your comment that it is not a requirement to close the branch, here's a series of steps that should get the default branch in tune with the develop branch:

    1. hg update default
    2. hg merge --tool internal:other -- to merge while privileging the develop branch
    3. hg diff -r develop -- compare with develop to ensure that you have an exact copy
    4. hg commit -m "merge updating default to current develop"

    Once complete, you should have an updated default that mirrors the develop branch, bringing them back into sync.

提交回复
热议问题