Greg Pfeil
8b46f81084
Replicate failure from #4898
2024-05-29 17:11:05 -06:00
Mitchell Rosen
32cde2cd35
relax merge preconditions on lca
2024-05-29 12:41:59 -04:00
Mitchell Rosen
1442dc02ac
fix up a couple transcripts
2024-05-24 11:08:44 -04:00
Mitchell Rosen
6adb88f5b3
delete a bunch of patch manipulation commands
2024-05-24 11:01:45 -04:00
Arya Irani
d20d30d475
update workflows for lib.install
2024-05-22 18:34:08 -04:00
Chris Penner
c9e6702c8e
Fix transcripts which use absolute paths with delete.namespace
2024-05-22 11:56:50 -07:00
Chris Penner
f25a221c25
Don't allow absolute paths in delete.namespace
2024-05-22 11:51:10 -07:00
Chris Penner
b210679917
Add failing transcript
2024-05-22 11:35:51 -07:00
Arya Irani
2ec8e01dd7
Merge pull request #4966 from unisonweb/topic/merge5
2024-05-20 10:48:43 -04:00
Arya Irani
1be90b1414
transcript output merge conflict
2024-05-18 23:42:51 -04:00
Arya Irani
8b762c7908
Merge branch 'trunk' into cp/definition-diffs
2024-05-18 10:31:26 -04:00
Chris Penner
4000a892e2
Transcripts
2024-05-17 19:08:11 -07:00
Mitchell Rosen
bc54e4d0b4
make pull
call new merge
instead of old merge
2024-05-17 13:49:13 -04:00
Chris Penner
240cddcc3f
Add definition diff apis and tests
2024-05-17 09:43:19 -07:00
Mitchell Rosen
b9a45d5f86
⅄ trunk → topic/merge5
2024-05-16 11:55:27 -04:00
Mitchell Rosen
693af9c809
⅄ trunk → topic/merge4
2024-05-15 12:03:16 -04:00
Arya Irani
a4a1dcfd8d
Merge pull request #4948 from unisonweb/fix/more-jit-misc
...
A couple more miscellaneous JIT issues
2024-05-14 18:21:02 -04:00
Dan Doel
7569e85bed
Bump @unison/internal dependency
2024-05-14 17:33:23 -04:00
Mitchell Rosen
3e224bd668
add test <arg>
example to transcript
2024-05-14 16:54:53 -04:00
Mitchell Rosen
06b743a149
slightly better error messages
2024-05-14 11:30:40 -04:00
Mitchell Rosen
f80b07db81
regenerate merge.md output
2024-05-14 09:30:23 -04:00
Mitchell Rosen
09ee97b149
update tab completion transcript
2024-05-13 11:34:01 -04:00
Mitchell Rosen
e18bbd40f9
⅄ trunk → topic/merge4
2024-05-13 10:36:03 -04:00
etorreborre
f8063ec42b
test: add an example of checking a RSA signature with an incorrect key
2024-05-12 17:56:04 +02:00
etorreborre
01bb42bbd3
feature: add RSA builtin functions for signing
2024-05-11 00:05:38 +02:00
Arya Irani
4ce7cdf5d4
Merge pull request #4844 from unisonweb/kylegoetz-udp
...
Kylegoetz udp
2024-05-10 13:03:50 -04:00
Arya Irani
69371698d0
update transcripts
2024-05-10 12:18:17 -04:00
Arya Irani
4da7930d11
unmodify jit-tests.sh
2024-05-10 12:03:34 -04:00
Arya Irani
9da0a4f43c
Merge remote-tracking branch 'origin/trunk' into kylegoetz-udp
2024-05-10 11:23:38 -04:00
Arya Irani
4c9deb169c
update transcript outputs
2024-05-10 11:22:57 -04:00
Arya Irani
b015f72133
Some edits to precondition violations section
2024-05-07 17:00:30 -04:00
Arya Irani
b70cad9869
fixup "not-conflict conflict"
2024-05-07 16:36:57 -04:00
Arya Irani
0144c69e49
simplify merge transcript
2024-05-07 13:51:11 -04:00
Mitchell Rosen
25e7288de2
properly set successful merge history, call out when a merge is fast-forward
2024-05-07 11:51:57 -04:00
Mitchell Rosen
90cc2b5bd9
update transcripts
2024-05-07 09:59:51 -04:00
Dan Doel
f6442c928e
Merge remote-tracking branch 'origin/trunk' into topic/jit-long-names
2024-05-06 16:56:34 -04:00
Dan Doel
a1ef6a76d1
Use full length hashes for jit names
...
This should avoid any possibility of picking conflicting names for
distinct functions. I'm not aware of any actual examples of this, but it
could in principle happen.
I decided to use the full length hashes because picking just-long-enough
names starts to become very cumbersome when doing dynamic loading. You
need to keep track of all your past choices, not just the choices for
the module you're loading, because the one you're loading could refer to
things in previously loaded modules. It would be possible to use shorter
names in a compile-time context, since you have all the names up front.
But you'd still have to remember _those_ for runtime loading, and it
seemed not worth it.
This doesn't include any custom error formatting, because I'd like to
see error messages in the wild before doing anything, but if they're too
verbose, it's possible to override the Racket error reporting to produce
shorter names there, rather than generating them up front.
2024-05-06 14:59:06 -04:00
Mitchell Rosen
d7b48dcb5c
minor cleanup
2024-05-06 13:03:41 -04:00
Kyle Goetz
e2aa974b80
use my branch on Share for testing
2024-05-06 00:07:12 -05:00
Dan Doel
043a202b63
Add test. Fix a corresponding EROR mismatch in boot.ss
2024-05-03 15:49:43 -04:00
Mitchell Rosen
0d155e99eb
better error messages for merge precondition violations
2024-05-02 16:28:30 -04:00
Mitchell Rosen
831005eaf3
⅄ trunk → topic/merge4
2024-05-01 13:26:43 -04:00
Mitchell Rosen
0babe4df90
update transcripts
2024-05-01 13:18:46 -04:00
Mitchell Rosen
0d0e6c2600
add merge libdeps transcript
2024-05-01 12:06:59 -04:00
Mitchell Rosen
a66e893352
add add/add unique type merge transcript
2024-05-01 12:00:46 -04:00
Mitchell Rosen
023cfd4690
add a couple merge transcripts
2024-05-01 11:56:27 -04:00
Kyle Goetz
7b2e520baa
temp JIT test script
2024-05-01 00:15:08 -05:00
Mitchell Rosen
b319c592dd
render things with the right PPEs
2024-04-30 14:47:39 -04:00
Kyle Goetz
0bc69c31a8
Merge remote-tracking branch 'origin/trunk' into kylegoetz-udp
2024-04-30 12:55:18 -05:00
Mitchell Rosen
b739c27f73
work on properly rendering merged Unison file
2024-04-29 18:52:34 -04:00