Mercurial-如何强制合并某些文件?
|
我正在尝试针对此问题对某些文件强制进行手动合并,但无法正常工作。即使我相信我已正确配置.hgrc,某些pom文件仍会自动合并。有任何想法吗?
我尝试摆弄合并工具的优先级。最初我们在
[ui]
之下有merge = bc
-删除了它,但没有帮助。
我的.hgrc:
[ui]
editor = notepad
username = Boo Hoo <boo.hoo@who.com>
ssh = plink
[extensions]
fetch =
hgext.extdiff =
mq =
hgext.graphlog =
[extdiff]
cmd.kdiff3 =
cmd.examdiff = C:\\Program Files (x86)\\ExamDiff Pro\\ExamDiff.exe
cmd.bc = C:\\Program Files (x86)\\Beyond Compare 3\\BCompare.exe
opts.bc = /leftreadonly
[merge-tools]
bc.executable = C:\\Program Files (x86)\\Beyond Compare 3\\BComp
bc.args = /leftreadonly /centerreadonly $local $other $base $output
bc.priority = 1
bc.premerge = True
manual.executable = C:\\Program Files (x86)\\Beyond Compare 3\\BComp
manual.args = /leftreadonly /centerreadonly $local $other $base $output
manual.priority = 100
manual.premerge = False
[merge-patterns]
.hgtags = manual
pom.xml = manual
**\\pom.xml = manual
没有找到相关结果
已邀请:
1 个回复
皇小福另届
),您可以尝试:
(使用外壳样式路径分隔符\'
\'代替\'
\') 或尝试使用正则表达式模式: