Mitchell Rosen
c118fa3ca6
put dependents and conflicts in the namespace on a merge branch
2024-09-05 15:01:23 -04:00
Mitchell Rosen
36ea0bb481
add failing transcript
2024-09-05 10:44:48 -04:00
Mitchell Rosen
28543adcdd
reuse unique type guids in merge after all
2024-08-13 12:46:42 -04:00
Mitchell Rosen
53209c3b69
more mergeblob work
2024-08-08 11:16:43 -04:00
Mitchell Rosen
565eb6625f
don't hydrate twice, and hyrate lca defns too
2024-08-05 12:10:16 -04:00
Mitchell Rosen
b94698057d
⅄ trunk → 24-08-01-merge-api
2024-08-05 10:38:38 -04:00
Mitchell Rosen
2860665925
extract findConflictedAlias to Unison.Merge
2024-08-01 08:03:48 -04:00
Chris Penner
e545e0b1a7
Rerun transcripts
2024-07-31 16:41:00 -07: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
Mitchell Rosen
94c6bfca62
add transcript
2024-07-09 14:10:53 -04:00
Greg Pfeil
0e76597e51
Merge remote-tracking branch 'upstream/trunk' into better-CLI-error-messages
2024-07-05 11:43:33 -06:00
Greg Pfeil
a7f1c24b57
Update transcript outputs
2024-07-05 11:28:27 -06:00
Arya Irani
38a73da600
switch Left to Right on help outputs; add draft transcripts
2024-07-05 11:33:11 -04:00
Chris Penner
d98b4aebc1
Port more transcripts to projects
2024-07-01 11:14:31 -07:00
Mitchell Rosen
25d505e784
port mergeloop.md over to use new merge
2024-06-26 12:24:00 -04:00
Mitchell Rosen
596cb39b2e
port empty namespace merge test to new merge
2024-06-26 12:13:18 -04:00
Mitchell Rosen
ae54637bae
add transcript that demonstrates bug in merge
2024-06-25 09:40:06 -04:00
Mitchell Rosen
5353a4e64c
properly handle deleted constructors in merge
2024-06-20 14:31:40 -04:00
Mitchell Rosen
84273a556f
revert tweak to merge failure output
2024-06-13 08:36:03 -04:00
Mitchell Rosen
e903a1c155
add merge.commit failure test
2024-06-13 08:29:02 -04:00
Mitchell Rosen
2e97d46db3
⅄ trunk → 24-05-20-merge-commit
2024-06-11 14:15:30 -04:00
Arya Irani
335512e331
fix conflicted alias message 2 ( #5071 )
...
Co-authored-by: aryairani <aryairani@users.noreply.github.com>
2024-06-11 09:40:43 -04:00
Arya Irani
a45fc88fb1
Update merge precondition message: Conflicted aliases ( #5070 )
2024-06-10 20:42:01 -04:00
Mitchell Rosen
e3440a91c6
don't consider update+delete a conflicted alias
2024-06-10 13:57:22 -04:00
Mitchell Rosen
528c2a1cd6
commit failing transcript
2024-06-10 13:56:12 -04:00
Mitchell Rosen
a1ecf83078
⅄ trunk → 24-05-20-merge-commit
2024-06-03 08:51:53 -04:00
Mitchell Rosen
899be60f5a
improve merge precondition violation output messages
2024-05-31 14:34:47 -04:00
Mitchell Rosen
32cde2cd35
relax merge preconditions on lca
2024-05-29 12:41:59 -04:00
Mitchell Rosen
ce9110be46
Add merge.commit command
2024-05-20 14:21:06 -04:00
Mitchell Rosen
bc54e4d0b4
make pull call new merge instead of old merge
2024-05-17 13:49:13 -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
Arya Irani
69371698d0
update transcripts
2024-05-10 12:18:17 -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
Mitchell Rosen
d7b48dcb5c
minor cleanup
2024-05-06 13:03:41 -04:00
Mitchell Rosen
0d155e99eb
better error messages for merge precondition violations
2024-05-02 16:28:30 -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
Mitchell Rosen
b319c592dd
render things with the right PPEs
2024-04-30 14:47:39 -04:00
Mitchell Rosen
b739c27f73
work on properly rendering merged Unison file
2024-04-29 18:52:34 -04:00
Mitchell Rosen
97faed97c1
add merged libdeps to ppe for rendering unison file
2024-04-24 15:31:40 -04:00
Mitchell Rosen
2e9e5cf17c
rename merge2 to merge
2024-04-24 12:31:54 -04:00
Mitchell Rosen
d37bce3e7e
rename and hide old merge commands
2024-04-24 12:29:15 -04:00
