Chris Penner
5f78557170
Solve conflicts
2024-07-01 14:30:55 -07:00
Chris Penner
fce12cb8b7
Work on fixing some transcripts for projects
2024-07-01 14:30:21 -07:00
Chris Penner
38d60e7e6e
Switch project before deleting it
2024-07-01 14:30:01 -07:00
Chris Penner
0b8548f36c
Delete some out of date bits of transcripts
2024-07-01 14:29:32 -07:00
Chris Penner
dadc4e476b
Merge trunk and resolve basic conflicts
2024-07-01 14:29:32 -07:00
Chris Penner
d98b4aebc1
Port more transcripts to projects
2024-07-01 11:14:31 -07:00
Arya Irani
71eed210ce
Merge pull request #5146 from unisonweb/24-06-26-port-old-merge-transcripts
2024-06-28 03:45:57 -04:00
Arya Irani
05585090c3
Merge pull request #5147 from unisonweb/todo-empty
2024-06-28 00:48:44 -04:00
Arya Irani
570db9b408
Merge pull request #5152 from unisonweb/topic/jit-cont
2024-06-28 00:48:04 -04:00
Dan Doel
907aba9550
Rerun jit tests with regenerated file
2024-06-27 17:21:42 -04:00
Dan Doel
8a04bf4f87
Merge remote-tracking branch 'origin/trunk' into topic/jit-cont
2024-06-27 16:21:25 -04:00
Mitchell Rosen
a76bca1326
re-run fix2254.md
2024-06-27 15:43:07 -04:00
Mitchell Rosen
7fd9b6507d
⅄ trunk → todo-empty
2024-06-27 15:42:56 -04:00
Mitchell Rosen
ce3c2dcb94
don't output nothing when there's nothing to do
2024-06-27 14:56:32 -04:00
mergify[bot]
c2060599bd
Merge pull request #5078 from unisonweb/cp/use-projects-in-transcripts
...
Use projects in transcripts
2024-06-27 18:37:58 +00:00
Chris Penner
937ac50e0a
Don't pull base in docs.to-html
2024-06-27 11:29:00 -07:00
Dan Doel
d45563e8e5
Disable continuation annotation until it's actually useful
2024-06-27 14:21:36 -04:00
Dan Doel
658d490b25
Transcript update
2024-06-27 14:18:09 -04:00
Chris Penner
4b7cf99df6
Fix fix5080 pulling over the network
2024-06-27 11:08:05 -07:00
Chris Penner
b6b2adb075
Resolve merge conflicts with trunk
2024-06-27 10:55:45 -07:00
Chris Penner
384083e190
Revive strangely deleted bits of merge.md
2024-06-27 10:30:48 -07:00
Chris Penner
47a3a01fbe
Fix up api transcripts
2024-06-27 10:25:16 -07:00
Dan Doel
c1bd940ce1
Bump share dependency
2024-06-27 12:28:39 -04:00
Mitchell Rosen
d1f2d78638
in update-on-conflict.md, replace use of merge.old with debug.alias.term.force
2024-06-27 11:44:46 -04:00
Mitchell Rosen
d9618f7ab3
in name-selection.md, replace use of merge.old with debug.alias.term.force
2024-06-27 11:41:25 -04:00
Mitchell Rosen
831c2e0e06
in diff-namespace.md, replace uses of merge.old with debug.alias.term.force
2024-06-27 11:30:17 -04:00
Mitchell Rosen
df9e78138f
in delete.md, replace uses of merge.old with debug.alias.{term,type}.force
2024-06-27 11:12:21 -04:00
Arya Irani
f824743347
Merge pull request #5144 from sellout/group-test-results
2024-06-27 10:39:05 -04:00
Mitchell Dalvi Rosen
4d8fa732af
Merge pull request #5139 from unisonweb/24-06-26-delete-type-force
...
feat: add debug.alias.type.force
2024-06-27 09:50:12 -04:00
Greg Pfeil
1a753ffb5b
Group test results by definition
...
Follow-up to #5140 .
2024-06-26 23:40:16 -06:00
Dan Doel
725a13be7f
Merge remote-tracking branch 'origin/trunk' into topic/jit-cont
2024-06-26 23:32:29 -04:00
Arya Irani
8292786e09
Merge pull request #5140 from sellout/numbered-test-results
2024-06-26 23:24:17 -04:00
Chris Penner
1c75272e9b
Revert reflog transcript to trunk for now
2024-06-26 16:14:21 -07:00
Chris Penner
20b5e93381
Update rewrites.md output
2024-06-26 16:06:26 -07:00
Chris Penner
a23e7d233e
Revert round-trip main.md transcript
2024-06-26 15:52:13 -07:00
Chris Penner
568fe7bfb7
Fix reflog transcript
2024-06-26 15:47:56 -07:00
Greg Pfeil
94d5ab03d9
Restore trailing whitespace in transcript
2024-06-26 16:05:48 -06:00
Chris Penner
209ddc0a5a
Merge trunk
2024-06-26 14:56:31 -07:00
Greg Pfeil
2faa425d76
Merge remote-tracking branch 'upstream/trunk' into numbered-test-results
2024-06-26 14:58:25 -06:00
Greg Pfeil
fd197f1369
Update the transcript outputs
2024-06-26 14:45:49 -06:00
Greg Pfeil
afa4b03f73
Make TestResult
a NumberedOutput
...
Fixes #5080 .
2024-06-26 14:44:43 -06:00
Greg Pfeil
77b46bce29
Eliminate Path.unsafeToName
...
In every case, this was being used in conjunction with `unsplitHQ`. So
this replaces `unsplitHQ` with `nameFromHQSplit`, which avoids
converting the `Split` to a `Path` in the middle.
2024-06-26 14:44:42 -06:00
Greg Pfeil
f1fd05f03d
Add a failing transcript for #5080
2024-06-26 14:44:33 -06:00
Chris Penner
2cb85ae5df
Fix up transcripts which mention __projects
2024-06-26 12:54:15 -07:00
Chris Penner
7122d595cf
Merge trunk
2024-06-26 12:54:15 -07:00
Arya Irani
e28c4f3d43
Merge pull request #5138 from unisonweb/24-06-26-port-old-merge-transcripts
2024-06-26 15:44:05 -04:00
Mitchell Rosen
cf1baee523
add debug.alias.type.force
2024-06-26 15:33:15 -04:00
Dan Doel
620a6334ff
Add continuation representations and move some support around
...
unison/data needs to have some of the continuation functions to
allow using the struct wrappers like procedures.
Includes some infrastructure for deserializing continuations.
2024-06-26 15:11:12 -04:00
Chris Penner
c9c3abcd52
Revert view.md, will port later
2024-06-26 12:06:13 -07:00
Chris Penner
103569a5cd
Port update-type-add-new-record to projects
2024-06-26 12:05:09 -07:00