Mercurial > hg > mercurial-crew-with-dirclash
view tests/test-ui-config.out @ 5483:0c43f87baba3 default tip
Fix file-changed-to-dir and dir-to-file commits (issue660).
Allow adding to dirstate files that clash with previously existing
but marked for removal. Protect from reintroducing clashes by revert.
This change doesn't address related issues with update. Current
workaround is to do "clean" update by manually removing conflicting
files/dirs from working directory.
author | Maxim Dounin <mdounin@mdounin.ru> |
---|---|
date | Sat, 27 Oct 2007 16:27:55 +0400 |
parents | 9881abfc0e44 |
children |
line wrap: on
line source
[('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