CODEWITHSUNDEEP
mercurialmergehgrc
Marcus Leon
Marcus Leon

Reputation: 56699

Mercurial - how to force a merge for certain files?

I am trying to force a manual merge for certain files per this question but it isn't working. Certain pom files are being auto merged even though I believe I have configured my .hgrc correctly. Any ideas?

I tried fiddling with the merge tools priority. Originally we had merge = bc under [ui] - removed this but it didn't help.

My .hgrc:

[ui]
editor = notepad
username = Boo Hoo <[email protected]>
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

Upvotes: 2

Views: 1076

Answers (1)

VonC
VonC

Reputation: 1328522

Considering the file name patterns, and the fact that merge-pattern are glob by default, rooted at the root directory (see hgrc merge-pattern), you could try:

**/pom.xml

(to use the shell-style path separator '/' instead of '\')

or try a regex pattern:

re:.*[/\\]pom.xml$

Upvotes: 1

Related Questions