merge: do early copy to deal with issue636
Without copies/renames, merges source names are 1:1 with their
targets. Copies and renames introduce the possibility that there will
be two merges with the same input but different output. By doing the
copy to the destination name before the merge, the actual merge
becomes 1:1 again, and no source is the input to two different merges.
- add a preliminary scan to applyupdates to do copies
- for the merge action, pass the old name (for finding ancestors) and
the new name (for input to the merge) to filemerge
- eliminate the old post-merge copy
- lookup file contents from new name in filemerge
- pass new name to external merge helper
- report merge failure at new name
- add a test
[('bool1', 'true'), ('bool2', 'false'), ('string', 'string value')]
[('list1', 'foo'), ('list2', 'foo bar baz'), ('list3', 'alice, bob'), ('list4', 'foo bar baz alice, bob')]
Error in configuration section [interpolation]:
'%' must be followed by '%' or '(', found: '%bad2'
---
'string value'
'true'
'false'
None
---
Error in configuration section [values] parameter 'string':
Not a boolean: string value
True
False
False
False
True
---
['foo']
['foo', 'bar', 'baz']
['alice', 'bob']
['foo', 'bar', 'baz', 'alice', 'bob']
['foo', 'bar', 'baz', 'alice', 'bob']
[]
[]
['foo']
['foo']
['foo', 'bar']
['foo', 'bar']
['foo bar']
['foo', 'bar']
---
'hallo'
'hallo world'
Error in configuration section [interpolation] parameter 'value3':
Bad value substitution:
section: [interpolation]
option : value3
key : novalue
rawval :
Error in configuration section [interpolation] parameter 'value4':
bad interpolation variable reference '%(bad)1'
Error in configuration section [interpolation] parameter 'value5':
'%' must be followed by '%' or '(', found: '%bad2'
---
No option 'Bar' in section: 'foo'
f == function