unisonweb/unison
1
0
Fork 0
mirror of https://github.com/unisonweb/unison.git synced 2024-09-19 22:37:12 +03:00
Code Issues Projects Releases Wiki Activity
15,015 Commits 417 Branches 90 Tags 330 MiB
cf202fef9a
Commit Graph

1279 Commits

Author SHA1 Message Date
Arya Irani
10aebd6211 fix #942; have propagate write new terms and types as it goes 2019-11-07 17:52:20 -05:00
Runar Bjarnason
edf28247c3 Added a transcript for numeric arguments 2019-11-07 16:53:24 -05:00
Paul Chiusano
da9ab8dcdb Add broken test 2019-11-07 16:24:54 -05:00
Paul Chiusano
37c5542390 Merge remote-tracking branch 'origin/master' into topic/docs 2019-11-07 15:14:47 -05:00
Chris Gibbs
7524f0d654 #936 pretty-print doc literals - skeleton 2019-11-06 23:02:05 +00:00
Arya Irani
6b415149d0 update out-of-sync transcript outputs 2019-11-05 08:17:32 -05:00
Paul Chiusano
d296266602 simplify paragraphyText, it's now much better behaved 2019-11-04 21:15:13 -05:00
Paul Chiusano
d28e532aa6 update docs example 2019-11-04 18:18:36 -05:00
Paul Chiusano
d3ab6ae190 Added a documentation transcript 2019-11-04 18:00:25 -05:00
Runar Bjarnason
c7722061a0 Workaround for unique type guid nondeterminism 2019-10-30 13:20:59 -04:00
Runar Bjarnason
ecd79f3d1c Merge branch 'master' of github.com:unisonweb/unison into topic/propagatetypes 2019-10-30 11:43:04 -04:00
Runar Bjarnason
6d95544bc2 I accidentally a line. 2019-10-30 11:42:32 -04:00
Runar Bjarnason
1636d8ea32 I accidentally this file 2019-10-28 16:25:28 -04:00
Arya Irani
cce64e3c03 change "branch" to "namespace" 2019-10-28 15:11:57 -04:00
Arya Irani
2dfb7958e9 update transcripts 2019-10-28 15:02:39 -04:00
Runar Bjarnason
ef640acb3b Make sure propagation only applies to local branch 2019-10-24 15:19:57 -04:00
Runar Bjarnason
38f7d1eda2 Test the preservation of user type variables 2019-10-23 15:27:35 -04:00
Runar Bjarnason
b35cc5875f Make the propagation actually replace stuff 2019-10-23 12:51:35 -04:00
Arya Irani
4c2a8f23e1 add a transcript test to close #873 2019-10-19 11:01:12 -04:00
Prat T
d49164fdb8 Add a transcript for find-patch 2019-10-11 22:20:57 -07:00
Arya Irani
93647cd8da expand numbered args in TranscriptParser 2019-10-11 15:49:25 -04:00
Arya Irani
fba10a4a62 Merge branch 'master' into topic/reflog 
# Conflicts:
#	unison-src/transcripts/merges.output.md
 2019-10-10 18:55:19 -04:00
Arya Irani
006b8837f6 add transcript test for reflog 2019-10-10 18:45:53 -04:00
Paul Chiusano
d0f15c917e improved parsing of ShortBranchHash by not trying to use the base32hex decoder, just do alphabet check 2019-10-09 18:39:43 -04:00
Paul Chiusano
8ce44ccca4 fix #849 2019-10-07 15:55:01 -04:00
Runar Bjarnason
51852b6414 Resolve merge bug between resolve.term and init 2019-10-03 16:37:55 -04:00
Rúnar
392b25068a
Runarorama/317 resolve edit command for resolving edit (#830) 
* Fixed branchdiff semigroup
* Fixed patch diff application in 3-way merge
* Added a transcript for resolve.term
 2019-10-03 12:59:12 -04:00
Paul Chiusano
ec4e952b9d added merge transcript test 2019-09-24 13:13:52 -04:00
Paul Chiusano
ebe1e05849 test harness for running integration tests 2019-09-24 12:10:35 -04:00