##// END OF EJS Templates
filemerge: fix crash when using filesets in [partial-merge-tools]...
Martin von Zweigbergk -
r50732:59466b13 6.3.2 stable
parent child Browse files
Show More
@@ -1132,7 +1132,9 b' def _run_partial_resolution_tools(repo, '
1132 patterns = ui.configlist(section, b'%s.patterns' % name, [])
1132 patterns = ui.configlist(section, b'%s.patterns' % name, [])
1133 is_match = True
1133 is_match = True
1134 if patterns:
1134 if patterns:
1135 m = match.match(repo.root, b'', patterns)
1135 m = match.match(
1136 repo.root, b'', patterns, ctx=local.fctx.changectx()
1137 )
1136 is_match = m(local.fctx.path())
1138 is_match = m(local.fctx.path())
1137 if is_match:
1139 if is_match:
1138 if ui.configbool(section, b'%s.disable' % name):
1140 if ui.configbool(section, b'%s.disable' % name):
@@ -196,6 +196,30 b' only `tail` should run'
196 >>>>>>> merge rev: 8c217da987be - test: a b c d e f2
196 >>>>>>> merge rev: 8c217da987be - test: a b c d e f2
197
197
198
198
199 Filesets can be used to select which files to run partial merge tools on.
200
201 $ hg up -C 4
202 1 files updated, 0 files merged, 0 files removed, 0 files unresolved
203 $ hg merge 3 -t :merge3 --config partial-merge-tools.head.patterns=set:other
204 merging file
205 warning: conflicts while merging file! (edit, then use 'hg resolve --mark')
206 0 files updated, 0 files merged, 0 files removed, 1 files unresolved
207 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon
208 [1]
209 $ cat file
210 b
211 c
212 d
213 e
214 <<<<<<< working copy: d57edaa6e21a - test: a b c d e f3
215 f3
216 ||||||| common ancestor: 8ae8bb9cc43a - test: a b c d e f
217 f
218 =======
219 f2
220 >>>>>>> merge rev: 8c217da987be - test: a b c d e f2
221
222
199 If there are several matching tools, they are run in requested order. We move
223 If there are several matching tools, they are run in requested order. We move
200 `head` after `tail` in order here so it has no effect (the conflict in "f" thus
224 `head` after `tail` in order here so it has no effect (the conflict in "f" thus
201 remains).
225 remains).
General Comments 0
You need to be logged in to leave comments. Login now