Artifact
a9d9253802b1a861c3e25e05e00e1dbd9de1c3bbd333abfaf60da98308baf3a8:
- File
src/json_branch.c
-
2021-01-26 15:27:27
— part of check-in
[6a5cdecddc]
on branch trunk
— Enhance 'fossil branch list' to accept a GLOB argument and show only matching branches.
(user:
danield
size: 11231)
-
2021-02-14 21:28:19
— part of check-in
[0516f4d3c8]
on branch ui-local-diff
— Brought graham's ui-local-diff branch up to date with respect to trunk.
This is not a simple merge, because it had to accommodate several
conflicting changes, so it needs to be re-checked for sanity before
being merged down to trunk. Also, some of the changes I made simply
reduce the size of the resulting diff relative to trunk and need to be
reverted; these are primarily 2-line splits of "else/if" so the
branch-specific change doesn't repeat the following "if" condition,
which is now the "else if" condition. I think this sort of thing aids
understanding of the diff, even though it breaks the style guidelines.
(user:
wyoung
size: 11231)
-
2021-02-25 14:55:51
— part of check-in
[7e755346a5]
on branch wiki-history
— Merge from trunk
(user:
george
size: 11231)
-
2021-03-01 07:37:26
— part of check-in
[ea28708f85]
on branch artifact-view-links
— Merged trunk changes in. Only needed to track my own rename of
branch_of_rid() to branch_of_ckin_rid()
(user:
wyoung
size: 11231)