Chris Penner
e545e0b1a7
Rerun transcripts
2024-07-31 16:41:00 -07:00
Arya Irani
0cd3cd1cff
Merge branch 'trunk' into cp/project-root
...
# Conflicts:
# unison-cli-integration/integration-tests/IntegrationTests/transcript.output.md
# unison-src/transcripts-round-trip/main.output.md
# unison-src/transcripts/add-run.output.md
# unison-src/transcripts/bug-strange-closure.output.md
# unison-src/transcripts/cycle-update-5.output.md
# unison-src/transcripts/delete.output.md
# unison-src/transcripts/diff-namespace.output.md
# unison-src/transcripts/move-namespace.output.md
# unison-src/transcripts/name-selection.output.md
# unison-src/transcripts/names.output.md
# unison-src/transcripts/namespace-dependencies.output.md
# unison-src/transcripts/propagate.output.md
# unison-src/transcripts/reflog.output.md
# unison-src/transcripts/reset.output.md
# unison-src/transcripts/tab-completion.output.md
# unison-src/transcripts/transcript-parser-commands.output.md
2024-07-10 23:49:04 -04:00
Greg Pfeil
0031542faf
Add a space before code block info strings
...
This is for consistency with the `cmark` style. Now the blocks we still
pretty-print ourselves will match the bulk of them that `cmark`
produces.
2024-07-10 13:56:07 -06:00
Greg Pfeil
1dc181b99a
Update the transcripts with cmark
...
`cmark`’s pretty-printer matches our output pretty well, with a few differences:
- it puts a space between the fence and the info string for in code blocks;
- it prefers `-` over `*` for bulleted lists (as do I) and it indents them;
- it `\`-escapes certain chars very conservatively;
- it prefers indented/unfenced code blocks if there is no info string; and
- it prefers `*` over `_` (unlike any sane person).
This also shows how the change fixes a number of issues:
- fix2158-1.output.md also illustrates how this change fixes #1809 ;
- alias-many.output.md and input-parse-errors.output.md show how fenced
code blocks without an info string would use the beginning of the
content as the info string;
- transcripts-round-trip/main.output.md shows how output blocks for
generated `unison` stanzas (which could contain nested fenced blocks)
might not have long-enough fences; and
- error-messages.output.md and generic-parse-errors.output.md show how
Unison errors were reported on the wrong line number (and thus the
printed error lines were also incorrect).
2024-07-10 13:37:51 -06:00
Chris Penner
fce12cb8b7
Work on fixing some transcripts for projects
2024-07-01 14:30:21 -07:00
Chris Penner
209ddc0a5a
Merge trunk
2024-06-26 14:56:31 -07:00
Chris Penner
6a1ccd5a64
Port empty-namespaces to projects
2024-06-26 11:01:11 -07:00
Mitchell Rosen
596cb39b2e
port empty namespace merge test to new merge
2024-06-26 12:13:18 -04:00
Chris Penner
5ca1eb3b8d
Replace '.' references with scratch/main
2024-06-25 11:11:07 -07:00
Mitchell Rosen
d37bce3e7e
rename and hide old merge commands
2024-04-24 12:29:15 -04:00
Chris Penner
ff166e1a29
Update transcripts
2023-01-30 11:08:34 -06:00
Travis Staton
2e94d163e7
remove ls.verbose, add find.all.verbose
2022-07-11 11:42:20 -04:00
Paul Chiusano
5ed0e34656
refresh transcripts
2022-06-06 13:59:53 -04:00
Paul Chiusano
bf71fd477a
transcript refresh
2022-04-06 16:20:44 -05:00
Chris Penner
3e3b44d1d1
Merge branch 'trunk' into topic/rehash-codebase
2022-02-14 13:31:57 -06:00
Chris Penner
e70c072bb1
Refresh transcripts with history numbering
2022-02-08 15:12:00 -06:00
Arya Irani
19daa28398
Merge branch 'trunk' into topic/merge-trunk-2022-02-07
2022-02-07 19:29:57 -07:00
Chris Penner
35d22623f6
Update changed history hash (expected due to a change in trunk to how empty namespaces are handled.)
2022-01-05 16:58:52 -06:00
Chris Penner
d43fbc70e3
Merge branch 'trunk' into topic/rehash-codebase
2022-01-05 15:54:21 -06:00
Chris Penner
35e5453be3
update hashes in transcripts
2021-12-14 14:47:42 -06:00
Chris Penner
dd3a97d424
Update transcript output
2021-12-13 12:20:59 -06:00
Chris Penner
53af75af57
Check for empty deletes in move.namespace
2021-12-13 12:14:16 -06:00
Chris Penner
7e1ba673a4
Fix merging on empty namespaces
2021-12-08 16:39:48 -06:00
Chris Penner
9bd63c79f1
Merge branch 'trunk' into cp/fix-ops-on-empty-namespaces
2021-12-08 16:34:17 -06:00
Chris Penner
d8dfaf6894
Consider only head when checking for empty branch in most commands
2021-12-06 15:49:02 -06:00
Chris Penner
0a625f3810
Copy transcripts from the other empty namespace branch
2021-12-06 15:38:09 -06:00
Chris Penner
c555190c17
Assert that history is properly merged for empty namespaces
2021-12-06 15:15:40 -06:00
Chris Penner
d5dbafcf88
Update transcripts to assert that history is preserved
2021-12-06 15:09:58 -06:00
Chris Penner
538dc4027e
Add _correct_ transcript output
2021-12-06 15:06:11 -06:00
Chris Penner
a7e7e53acf
Add transcript (with incorrect output)
2021-12-06 14:44:40 -06:00
