equal
deleted
inserted
replaced
205 a |
205 a |
206 b2 |
206 b2 |
207 c |
207 c |
208 d |
208 d |
209 e3 |
209 e3 |
|
210 |
|
211 Test that arguments get passed as expected. |
|
212 |
|
213 $ cat >> "$TESTTMP/log-args.sh" <<'EOF' |
|
214 > #!/bin/sh |
|
215 > echo "$@" > args.log |
|
216 > EOF |
|
217 $ chmod +x "$TESTTMP/log-args.sh" |
|
218 $ cat >> "$HGRCPATH" <<EOF |
|
219 > [partial-merge-tools] |
|
220 > log-args.executable=$TESTTMP/log-args.sh |
|
221 > EOF |
|
222 $ hg up -C 2 |
|
223 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
224 $ hg merge 1 |
|
225 merging file |
|
226 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
|
227 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
228 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
229 [1] |
|
230 $ cat args.log |
|
231 */hgmerge-*/file~local */hgmerge-*/file~base */hgmerge-*/file~other (glob) |
|
232 $ hg up -C 2 |
|
233 1 files updated, 0 files merged, 0 files removed, 0 files unresolved |
|
234 $ hg merge 1 --config partial-merge-tools.log-args.args='--other $other $base --foo --local $local --also-other $other' |
|
235 merging file |
|
236 warning: conflicts while merging file! (edit, then use 'hg resolve --mark') |
|
237 0 files updated, 0 files merged, 0 files removed, 1 files unresolved |
|
238 use 'hg resolve' to retry unresolved file merges or 'hg merge --abort' to abandon |
|
239 [1] |
|
240 $ cat args.log |
|
241 --other */hgmerge-*/file~other */hgmerge-*/file~base --foo --local */hgmerge-*/file~local --also-other */hgmerge-*/file~other (glob) |