tests/test-parseindex2.py.out
author |
Kostia Balytskyi <ikostia@fb.com> |
|
Sat, 19 Nov 2016 15:41:37 -0800 |
changeset 30460 |
ce3a133f71b3 |
parent 7110 |
75fdc39b6172
|
permissions |
-rw-r--r-- |
conflicts: make spacing consistent in conflict markers
The way default marker template was defined before this patch,
the spacing before dash in conflict markes was dependent on
whether changeset is a tip one or not. This is a relevant part
of template:
'{ifeq(tags, "tip", "", "{tags} "}'
If revision is a tip revision with no other tags, this would
resolve to an empty string, but for revisions which are not tip
and don't have any other tags, this would resolve to a single
space string. In the end this causes weirdnesses like the ones
you can see in the affected tests.
This is a not a big deal, but double spacing may be visually
less pleasant.
Please note that test changes where commit hashes change are
the result of marking files as resolved without removing markers.