Mercurial将默认值合并到命名分支

Question

我有一个非常简单的Mercurial repo,除了分支之外还有一个名为branch的default分支.

已经进行了更改并将其提交给default分支,我想将它们合并到我的命名分支中.但是,a hg merge default似乎并未在所有变化中合并.

例如:

hg update working
99 files updated, 0 files merged, 0 files removed, 0 files unresolved

hg status -m --rev default:working

大约有20个文件有修改

M ... some list of files...
hg merge default
merging path/to/a/file/foo.java
3 files updated, 1 files merged, 0 files removed, 0 files unresolved
(branch merge, don't forget to commit)

hg status -m --rev default:working

现在仍然存在我希望合并的修改文件.

我可以做一个hg diff -r default,看看有没有合并的变化.

这就是回购的样子

@  changeset:   4:d41da580b434
|  branch:      working
|  tag:         tip
|  parent:      1:3ed1c8bf91cf
|  user:        bob costas
|  date:        Tue Mar 24 10:13:25 2015 -0500
|  summary:     pr-1243 and minor updates
|
| o  changeset:   2:ea0c249218fa
| |  parent:      0:385565af3c13
| |  user:        bob costas
| |  date:        Mon Mar 23 15:09:42 2015 -0500
| |  summary:     bunch of updated files and fixes
| |
o |  changeset:   1:3ed1c8bf91cf
|/   branch:      working
|    user:        bob costas
|    date:        Mon Mar 23 13:38:59 2015 -0500
|    summary:     pr-1231 
|
o  changeset:   0:385565af3c13
   user:        bob costas
   date:        Thu Mar 19 18:15:52 2015 -0500
   summary:     initial commit

Answer 1

你没有提交你的合并.. Mercurial告诉你:

hg merge default 

合并路径/到/ a/file/foo.java 3个文件更新,1个文件合并,0个文件被删除,0个文件未解析(分支合并,别忘了提交)

合并时,所有文件都会在源中保留修改,并且您需要提交它们

hg commit -m "merge with default"

然后您的分支将出现在日志中.