annotate test-data/sample.rc @ 709:497e697636fc

Report merged lines as changed block if possible, not as a sequence of added/deleted blocks. To facilitate access to merge parent lines AddBlock got mergeLineAt() method that reports index of the line in the second parent (if any), while insertedAt() has been changed to report index in the first parent always
author Artem Tikhomirov <tikhomirov.artem@gmail.com>
date Wed, 21 Aug 2013 16:23:27 +0200
parents e4a71afd3c71
children
rev   line source
609
e4a71afd3c71 Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
1 [section1]
e4a71afd3c71 Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
2 # comment
e4a71afd3c71 Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
3 key1=value 1
e4a71afd3c71 Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
4 key2=value 2
e4a71afd3c71 Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
5 key3=value 3#comment
e4a71afd3c71 Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
6
e4a71afd3c71 Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
7 %include ./included.rc
e4a71afd3c71 Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
8
e4a71afd3c71 Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
9 [section3]
e4a71afd3c71 Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
10 key1=value 1-3
e4a71afd3c71 Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
11
e4a71afd3c71 Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
12 [section1]
e4a71afd3c71 Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
13 key4=value 4
e4a71afd3c71 Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
14 %unset key1
e4a71afd3c71 Test TODOs: test for ConfigFile (covering %include and %unset directives)
Artem Tikhomirov <tikhomirov.artem@gmail.com>
parents:
diff changeset
15