-
Notifications
You must be signed in to change notification settings - Fork 12
/
Copy pathChangeLog
5655 lines (4393 loc) · 218 KB
/
ChangeLog
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
2012-02-13 Paul Fitzpatrick <[email protected]>
* doc/tutorial_git.dox, scripts/check_git.sh,
src/libsheet/include/coopy/PolyBook.h,
src/libsheet_core/CMakeLists.txt, src/libsheet_core/OS.cpp,
src/libsheet_core/include/coopy/OS.h,
src/libsheet_core/include/coopy/TextBook.h,
src/libsqlite/SqliteTextBook.cpp,
src/libsqlite/include/coopy/SqliteTextBook.h,
src/libsqlite/test_sqlite.cpp, src/ssformat/ssformat.cpp,
src/testing/CMakeLists.txt: support for storing sqlite databases in
git
2012-02-13 Paul Fitzpatrick <[email protected]>
* doc/tutorial_diff.dox, doc/tutorial_diff.paradox: fix typo, add
link
2012-02-13 Paul Fitzpatrick <[email protected]>
* src/libsheet_core/SheetPatcher.cpp, src/testing/CMakeLists.txt:
basic test for ours/theirs/neither resolution of simple conflicted
highlighter diff
2012-02-13 Paul Fitzpatrick <[email protected]>
* CMakeLists.txt, conf/CoopyOptions.cmake: factor out options
2012-02-11 Paul Fitzpatrick <[email protected]>
* doc/cmd_sspatch.dox, doc/cmd_ssrediff.dox: options for resolving
conflicts
2012-02-11 Paul Fitzpatrick <[email protected]>
* src/libsheet/Diff.cpp, src/libsheet/Options.cpp,
src/libsheet/PatchParser.cpp,
src/libsheet_core/MergeOutputFilter.cpp,
src/libsheet_core/SheetPatcher.cpp, src/testing/CMakeLists.txt,
tests/conflict/bridges_v3.csv, tests/conflict/bridges_v4.csv: allow
resolution of conflicts in patch file
2012-02-09 Paul Fitzpatrick <[email protected]>
* src/libsheet/PatchParser.cpp,
src/libsheet_core/MergeOutputTdiff.cpp,
src/libsheet_core/MergeOutputVerboseDiff.cpp,
src/libsheet_core/SheetPatcher.cpp,
tests/conflict/bridges_v1_v2_parent.tdiff, tests/quote_me.csv,
tests/quote_me2.csv: keep around parent value for conflicts, in
tdiff rep
2012-02-09 Paul Fitzpatrick <[email protected]>
* CoopyGuide.pdf: updated pdf
2012-02-09 Paul Fitzpatrick <[email protected]>
* conf/CoopyDocLatex.cmake, doc/pdf_order.txt,
scripts/process_dox.sh: freshen pdf manual
2012-02-08 Paul Fitzpatrick <[email protected]>
* doc/main.dox, doc/tutorial_diff.dox, doc/tutorial_diff.paradox:
freshen main page
2012-02-08 Paul Fitzpatrick <[email protected]>
* CMakeLists.txt, doc/spec_hilite.dox, doc/spec_hilite.paradox,
doc/spec_hilite_schema.dox, doc/spec_hilite_schema.paradox,
src/libsheet/PatchParser.cpp, src/libsheet_core/SheetPatcher.cpp,
src/ssrender/CsvRender.cpp, src/ssrender/csv2html.cpp,
src/ssrender/include/coopy/CsvRender.h,
tests/header/bridges_quark.csvs: clean up add/remove columns in
highlighter format
2012-01-21 Paul Fitzpatrick <[email protected]>
* bindings/coopy.i, bindings/example.py, src/gui/CMakeLists.txt,
src/libaccess/include/coopy/AccessSheet.h,
src/libaccess/include/coopy/AccessTextBook.h,
src/libsheet/CMakeLists.txt, src/libsheet/Coopy.cpp,
src/libsheet/PatchParser.cpp, src/libsheet/include/coopy/Coopy.h,
src/libsheet/include/coopy/PatchParser.h,
src/libsheet/include/coopy/PolyBook.h,
src/libsheet_core/CMakeLists.txt, src/libsheet_core/CsvPatch.cpp,
src/libsheet_core/MergeOutputAccum.cpp,
src/libsheet_core/MergeOutputCsvDiffV0p2.cpp,
src/libsheet_core/Merger.cpp, src/libsheet_core/Patcher.cpp,
src/libsheet_core/PolySheet.cpp,
src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/CsvPatch.h,
src/libsheet_core/include/coopy/MergeOutputAccum.h,
src/libsheet_core/include/coopy/PolySheet.h,
src/libsheet_core/include/coopy/TextBook.h,
src/libsheet_core/include/coopy/WrapBook.h,
src/ssfossil/src/csv_hooks.cpp, src/testing/CMakeLists.txt,
src/testing/test_sheet.cpp,
tests/result_altitude_diff_remove_row.csv,
tests/result_altitude_diff_typo.csv,
tests/result_altitude_merge_conflict.csv,
tests/result_company_merge_conflicting.csv,
tests/result_directory_merge_spelling.csv,
tests/result_excel_patch_002_col_insert.html,
tests/result_excel_patch_003_col_insert.html,
tests/result_excel_patch_004_col_delete.html,
tests/result_excel_patch_005_row_update.html,
tests/result_excel_patch_006_row_insert.html,
tests/result_excel_patch_007_row_delete.html: general cleanup
2012-01-19 Paul Fitzpatrick <[email protected]>
* conf/coopy_doxygen.conf.in, src/libsheet/BookHook.cpp.in,
src/libsheet/PolyBook.cpp, src/libsheet/include/coopy/Options.h,
src/libsheet/include/coopy/PolyBook.h,
src/libsheet_core/CMakeLists.txt, src/libsheet_core/CsvMerge.cpp,
src/libsheet_core/DataBook.cpp, src/libsheet_core/TextBook.cpp,
src/libsheet_core/include/coopy/Appearance.h,
src/libsheet_core/include/coopy/BookCompare.h,
src/libsheet_core/include/coopy/ColMan.h,
src/libsheet_core/include/coopy/ColumnInfo.h,
src/libsheet_core/include/coopy/ColumnRef.h,
src/libsheet_core/include/coopy/CompareFlags.h,
src/libsheet_core/include/coopy/CsvMerge.h,
src/libsheet_core/include/coopy/DataBook.h,
src/libsheet_core/include/coopy/DataSheet.h,
src/libsheet_core/include/coopy/FoldedSheet.h,
src/libsheet_core/include/coopy/Patcher.h,
src/libsheet_core/include/coopy/RowMan.h,
src/libsheet_core/include/coopy/TextBook.h,
src/libsheet_core/include/coopy/TextBookFactory.h,
src/libsocialcalc/CMakeLists.txt, src/sslive/CMakeLists.txt,
src/sslive/sslive.cpp, src/testing/test_sheet.cpp: cleanup
2011-12-17 Paul Fitzpatrick <[email protected]>
* doc/spec_hilite.dox, doc/spec_hilite.paradox,
doc/spec_hilite_schema.dox, doc/spec_hilite_schema.paradox: clean up
phrasing
2011-12-16 Paul Fitzpatrick <[email protected]>
* doc/cmd_ssdiff.dox, doc/cmd_ssformat.dox, doc/cmd_ssmerge.dox,
doc/cmd_sspatch.dox, doc/cmd_ssrediff.dox, doc/cmd_ssresolve.dox,
doc/patch_format.dox, doc/spec_hilite.dox, doc/spec_hilite.paradox,
doc/tutorial_hilite.dox, doc/tutorial_hilite.paradox,
src/ssrender/CsvRender.cpp, src/ssrender/csv2html.cpp: add first
pass at hilite format spec
2011-12-16 Paul Fitzpatrick <[email protected]>
* src/libsheet/BookHook.cpp.in, src/libsheet/Options.cpp: add notes
to json options
2011-12-16 Paul Fitzpatrick <[email protected]>
* scripts/make_packages.sh: add source package option
2011-12-15 Paul Fitzpatrick <[email protected]>
* src/gui/src/coopy.cpp: fix windows build
2011-12-14 Paul Fitzpatrick <[email protected]>
* src/libsheet/PatchParser.cpp, src/libsheet_core/SheetPatcher.cpp:
avoid null sheet names in pool
2011-12-14 Paul Fitzpatrick <[email protected]>
* doc/tutorial_diff.paradox, doc/tutorial_hilite.paradox,
doc/tutorial_ids.dox, doc/tutorial_ids.paradox,
scripts/process_dox.sh, src/testing/CMakeLists.txt: mention ssmerge
as an alternative to ssdiff+sspatch
2011-12-14 Paul Fitzpatrick <[email protected]>
* CoopyGuide.pdf, doc/tutorial_diff.dox, doc/tutorial_hilite.dox,
doc/tutorial_ids.dox: update pdf guide
2011-12-14 Paul Fitzpatrick <[email protected]>
* conf/CoopyDocLatex.cmake, doc/cmd_coopy.dox, doc/cmd_ssdiff.dox,
doc/cmd_ssformat.dox, doc/cmd_ssmerge.dox, doc/cmd_sspatch.dox,
doc/cmd_ssrediff.dox, doc/cmd_ssresolve.dox, doc/pdf_order.txt,
doc/tutorial_diff.dox, doc/tutorial_hilite.dox,
doc/tutorial_ids.dox, scripts/fix_order.sh, scripts/process_dox.sh,
src/ssrender/CsvRender.cpp, src/ssrender/csv2html.cpp: fix up pdf
manual
2011-12-14 Paul Fitzpatrick <[email protected]>
* doc/tutorial_coopy_conflict.dox, doc/tutorial_coopy_fork.dox,
doc/tutorial_coopy_new.dox, doc/tutorial_coopy_pull.dox,
doc/tutorial_coopy_push.dox, doc/tutorial_diff.paradox,
doc/tutorial_hilite.paradox, doc/tutorial_ids.paradox:
hilite2->hilite
2011-12-14 Paul Fitzpatrick <[email protected]>
* conf/CoopyDoc.cmake, scripts/process_dox.sh: separate out pdf
generation
2011-12-13 Paul Fitzpatrick <[email protected]>
* conf/CoopyDocLatex.cmake, doc/pdf_order.txt,
doc/tutorial_diff.dox, doc/tutorial_diff.paradox,
doc/tutorial_hilite.dox, doc/tutorial_hilite.paradox,
doc/tutorial_ids.dox, doc/tutorial_ids.paradox,
scripts/process_dox.sh, src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/SheetPatcher.h,
src/ssrender/CsvRender.cpp, src/ssrender/csv2html.cpp,
src/ssrender/include/coopy/CsvRender.h: freshen documentation
2011-12-13 Paul Fitzpatrick <[email protected]>
* doc/main.dox, doc/tutorial_hilite.dox,
doc/tutorial_hilite.paradox, doc/tutorial_ids.dox,
doc/tutorial_ids.paradox, scripts/process_dox.sh,
src/libsheet/Diff.cpp, src/libsheet/PoolImpl.cpp,
src/libsheet/include/coopy/PoolImpl.h,
src/libsheet_core/BookCompare.cpp,
src/libsheet_core/MergeOutputFilter.cpp,
src/libsheet_core/NameSniffer.cpp, src/libsheet_core/Patcher.cpp,
src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/MergeOutputFilter.h,
src/libsheet_core/include/coopy/NameSniffer.h,
src/libsheet_core/include/coopy/Patcher.h,
src/libsheet_core/include/coopy/Pool.h, src/testing/CMakeLists.txt,
tests/directory/directory.tdiff,
tests/directory/directory_alice.tdiff,
tests/directory/directory_bob.tdiff: improved pool behavior for
patching divergent sqlite databases
2011-12-12 Paul Fitzpatrick <[email protected]>
* bindings/CMakeLists.txt, bindings/coopy.i,
conf/CoopyConfig.cmake.in, conf/coopy_doxygen.conf.in,
doc/bridge.py, doc/bridge.rb, doc/cmd_ssdiff.dox,
doc/cmd_ssrediff.dox, doc/main.dox, doc/tutorial_diff.dox,
doc/tutorial_diff.paradox, doc/tutorial_hilite.dox,
doc/tutorial_hilite.paradox, scripts/process_dox.sh,
src/libsheet/Options.cpp, src/libsheet/PolyBook.cpp,
src/libsheet/include/coopy/PatchParser.h,
src/libsheet_core/MergeOutputRowOps.cpp,
tests/review/review_all.ops: document hilite format better
2011-12-10 Paul Fitzpatrick <[email protected]>
* conf/CoopyDoc.cmake, doc/cmd_coopy.dox, doc/cmd_ssdiff.dox,
doc/cmd_ssformat.dox, doc/cmd_ssmerge.dox, doc/cmd_sspatch.dox,
doc/cmd_ssrediff.dox, doc/cmd_ssresolve.dox,
scripts/generate_examples.sh, scripts/process_dox.sh,
src/libsheet/Options.cpp, src/sspatch/sspatch.cpp: documentation
update
2011-12-10 Paul Fitzpatrick <[email protected]>
* src/libsheet/Options.cpp, src/libsheet/PatchParser.cpp,
src/libsheet_core/MergeOutputFilter.cpp,
src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/CompareFlags.h,
src/libsheet_core/include/coopy/SheetPatcher.h,
src/sspatch/sspatch.cpp: bring back synonyms
2011-12-10 Paul Fitzpatrick <[email protected]>
* scripts/test_coopy.sh, src/libsheet/Diff.cpp,
src/libsheet/Options.cpp, src/libsheet/PatchParser.cpp,
src/libsheet_core/BookCompare.cpp, src/libsheet_core/DataBook.cpp,
src/libsheet_core/MergeOutputFilter.cpp,
src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/DataBook.h,
src/libsheet_core/include/coopy/MergeOutputFilter.h,
src/libsqlite/SqliteSheet.cpp, src/testing/CMakeLists.txt: allow for
optional creation of missing tables
2011-12-09 Paul Fitzpatrick <[email protected]>
* scripts/check.sh, src/libsheet/Diff.cpp,
src/libsheet/Options.cpp, src/libsheet_core/BookCompare.cpp,
src/libsheet_core/MergeOutputFilter.cpp,
src/libsheet_core/MergeOutputTdiff.cpp,
src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/CompareFlags.h,
src/libsheet_core/include/coopy/MergeOutputFilter.h: better schema
filtering
2011-12-09 Paul Fitzpatrick <[email protected]>
* scripts/release.sh: fix release script
2011-12-09 Paul Fitzpatrick <[email protected]>
* conf/CoopyVersion.cmake: version bump
2011-12-09 Paul Fitzpatrick <[email protected]>
* scripts/check.sh, src/testing/CMakeLists.txt: fix call to
--version rather than --format-version
2011-12-09 Paul Fitzpatrick <[email protected]>
* src/libsheet/Options.cpp, src/libsheet/include/coopy/PolyBook.h,
src/libsheet_core/BookCompare.cpp,
src/libsheet_core/MergeOutputTdiff.cpp,
src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/BookCompare.h,
src/libsheet_core/include/coopy/ColumnInfo.h,
src/libsheet_core/include/coopy/DataBook.h,
src/libsheet_core/include/coopy/Patcher.h,
src/libsqlite/SqliteSheet.cpp, src/ssdiff/ssdiff.cpp,
tests/header/applicants_base_fix.tdiff: generate schema as tdiff
2011-12-09 Paul Fitzpatrick <[email protected]>
* src/libsheet/PoolImpl.cpp, src/libsheet/include/coopy/PolyBook.h,
src/libsheet/include/coopy/PoolImpl.h,
src/libsheet_core/DataBook.cpp,
src/libsheet_core/include/coopy/DataBook.h,
src/libsheet_core/include/coopy/DataSheet.h,
src/libsheet_core/include/coopy/PolySheet.h,
src/libsheet_core/include/coopy/Pool.h,
src/libsheet_core/include/coopy/SheetSchema.h,
src/libsqlite/SqliteSheet.cpp, src/ssformat/ssformat.cpp: fix up
ssformat to respect pool info
2011-12-09 Paul Fitzpatrick <[email protected]>
* src/libsheet/CMakeLists.txt, src/libsheet/Diff.cpp,
src/libsheet/Options.cpp, src/libsheet/PatchParser.cpp,
src/libsheet/PolyBook.cpp, src/libsheet/PoolImpl.cpp,
src/libsheet/include/coopy/CsvTextBook.h,
src/libsheet/include/coopy/PolyBook.h,
src/libsheet/include/coopy/PoolImpl.h,
src/libsheet_core/CMakeLists.txt, src/libsheet_core/DataBook.cpp,
src/libsheet_core/Patcher.cpp, src/libsheet_core/Pool.cpp,
src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/DataBook.h,
src/libsheet_core/include/coopy/DataSheet.h,
src/libsheet_core/include/coopy/PolySheet.h,
src/libsheet_core/include/coopy/Pool.h,
src/libsheet_core/include/coopy/PoolImpl.h,
src/libsheet_core/include/coopy/SheetPatcher.h,
src/sspatch/sspatch.cpp, src/testing/CMakeLists.txt,
tests/fold/contacts_add_foreign.csvs,
tests/fold/contacts_add_multi.csvs,
tests/fold/contacts_add_multi_foreign.csvs,
tests/fold/contacts_meta.tdiff: defer rows if needed
2011-12-07 Paul Fitzpatrick <[email protected]>
* src/libsheet_core/include/coopy/MergeOutputFilter.h: support older
gcc
2011-12-07 Paul Fitzpatrick <[email protected]>
* src/libsheet_core/MergeOutputFilter.cpp,
src/libsheet_core/include/coopy/MergeOutputFilter.h: missing
initializer for name change
2011-12-07 Paul Fitzpatrick <[email protected]>
* src/libsheet/Diff.cpp, src/libsheet/Options.cpp,
src/libsheet/PatchParser.cpp, src/libsheet_core/CMakeLists.txt,
src/libsheet_core/MergeOutputFilter.cpp,
src/libsheet_core/Patcher.cpp, src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/CompareFlags.h,
src/libsheet_core/include/coopy/MergeOutputFilter.h,
src/libsheet_core/include/coopy/MergeOutputPool.h,
src/libsheet_core/include/coopy/Patcher.h,
src/libsheet_core/include/coopy/Pool.h: add more filter options for
ssrediff
2011-12-06 Paul Fitzpatrick <[email protected]>
* src/libsheet_core/DataSheet.cpp,
src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/DataSheet.h: coining/autoincrement
for csvs format
2011-12-05 Paul Fitzpatrick <[email protected]>
* src/CMakeLists.txt, src/gui/CMakeLists.txt,
src/libsheet/CMakeLists.txt, src/ssfossil/CMakeLists.txt,
src/testing/CMakeLists.txt: shuffle gnumeric dependency
2011-12-05 Paul Fitzpatrick <[email protected]>
* doc/cmd_ssdiff.dox, doc/cmd_ssmerge.dox,
src/libsheet/CMakeLists.txt, src/libsheet/Options.cpp,
src/libsheet_core/CMakeLists.txt, src/libsheet_core/DataBook.cpp,
src/libsheet_core/DataSheet.cpp, src/libsheet_core/FoldedSheet.cpp,
src/libsheet_core/Merger.cpp, src/libsheet_core/Patcher.cpp,
src/libsheet_core/SheetCompare.cpp,
src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/CompareFlags.h,
src/libsheet_core/include/coopy/CsvSheet.h,
src/libsheet_core/include/coopy/DataSheet.h,
src/libsheet_core/include/coopy/FoldedSheet.h,
src/libsheet_core/include/coopy/Patcher.h,
src/libsheet_core/include/coopy/PolySheet.h,
src/libsheet_core/include/coopy/TypedSheet.h,
src/libsheet_fold/CMakeLists.txt, src/libsheet_fold/FoldTool.cpp,
src/libsheet_fold/FoldedSheet.cpp,
src/libsheet_fold/include/coopy/FoldedSheet.h,
tests/fold/contacts_add.csvs: better row insertation
2011-12-05 Paul Fitzpatrick <[email protected]>
* src/libremotesql/RemoteSqlSheet.cpp,
src/libremotesql/include/coopy/RemoteSqlSheet.h,
src/libsheet/Options.cpp, src/libsheet_core/DataSheet.cpp,
src/libsheet_core/Pool.cpp, src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/CompareFlags.h,
src/libsheet_core/include/coopy/DataSheet.h,
src/libsheet_core/include/coopy/PolySheet.h,
src/libsheet_core/include/coopy/Pool.h,
src/libsheet_core/include/coopy/PoolImpl.h,
src/libsheet_core/include/coopy/SheetPatcher.h,
src/libsqlite/SqliteSheet.cpp,
src/libsqlite/include/coopy/SqliteSheet.h: prep for autoincrement
adds
2011-12-05 Paul Fitzpatrick <[email protected]>
* src/testing/CMakeLists.txt, tests/gut/bobs_mods.tdiff: add gut
example test
2011-12-05 Paul Fitzpatrick <[email protected]>
* BUILD.txt: use build-dep, stop being silly
2011-11-21 Paul Fitzpatrick <[email protected]>
* src/libsheet/Diff.cpp, src/libsheet/PatchParser.cpp,
src/libsheet_core/BookCompare.cpp,
src/libsheet_core/CMakeLists.txt,
src/libsheet_core/MergeOutputVerboseDiff.cpp,
src/libsheet_core/Patcher.cpp, src/libsheet_core/Pool.cpp,
src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/CompareFlags.h,
src/libsheet_core/include/coopy/MergeOutputVerboseDiff.h,
src/libsheet_core/include/coopy/Patcher.h,
src/libsheet_core/include/coopy/Pool.h,
src/libsheet_core/include/coopy/PoolImpl.h,
src/libsheet_core/include/coopy/RefCount.h,
src/libsheet_core/include/coopy/SheetPatcher.h: tracking pool for
x-refs
2011-11-15 Paul Fitzpatrick <[email protected]>
* src/libsheet_core/FormatSniffer.cpp: another tdiff hint: @@@
2011-11-14 Paul Fitzpatrick <[email protected]>
* src/libsheet/Options.cpp, src/libsheet_core/DataColumn.cpp,
src/libsheet_core/DataStat.cpp,
src/libsheet_core/MergeOutputIndex.cpp,
src/libsheet_core/SheetCompare.cpp,
src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/CompareFlags.h,
src/libsheet_core/include/coopy/DataColumn.h,
src/libsheet_core/include/coopy/SheetPatcher.h,
src/testing/CMakeLists.txt, src/testing/test_sheet.cpp,
tests/link_nn_nn_wide.csvs: correct csv header propagation control
2011-11-14 Paul Fitzpatrick <[email protected]>
* src/libsheet_core/MergeOutputIndex.cpp: clear old index data if
needed
2011-11-14 Paul Fitzpatrick <[email protected]>
* doc/cmd_ssdiff.dox, doc/cmd_sspatch.dox, doc/cmd_ssrediff.dox,
scripts/process_dox.sh: doc update
2011-11-14 Paul Fitzpatrick <[email protected]>
* src/libsheet_core/IndexSniffer.cpp: fallback when no primary key
specified
2011-11-14 Paul Fitzpatrick <[email protected]>
* src/libsheet/Diff.cpp, src/libsheet_core/IndexSniffer.cpp,
src/libsheet_core/MergeOutputIndex.cpp,
src/libsheet_core/Merger.cpp, src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/CompareFlags.h,
src/libsheet_core/include/coopy/MergeOutputIndex.h,
src/libsheet_core/include/coopy/NameSniffer.h,
src/libsheet_core/include/coopy/Patcher.h,
src/libsheet_core/include/coopy/SheetPatcher.h,
src/testing/CMakeLists.txt, tests/book/contact_base.csvs,
tests/book/contact_change_one.csvs,
tests/book/contact_dreamer.csvs, tests/book/contact_remove.csvs,
tests/fold/contacts.csvs, tests/fold/contacts_to_thumb.csvs,
tests/fold/thumb.csvs, tests/link_nn_nn_wide.csvs: index format and
tests
2011-11-13 Paul Fitzpatrick <[email protected]>
* src/libsheet_core/MergeOutputIndex.cpp,
src/libsheet_core/Merger.cpp,
src/libsheet_core/include/coopy/MergeOutputIndex.h: fix index logic
given column changes
2011-11-13 Paul Fitzpatrick <[email protected]>
* src/gui/src/coopy.cpp, src/libsheet/PatchParser.cpp,
src/libsheet_core/MergeOutputIndex.cpp,
src/libsheet_core/MergeOutputTdiff.cpp,
src/libsheet_core/Merger.cpp,
src/libsheet_core/include/coopy/MergeOutputIndex.h,
src/libsheet_core/include/coopy/MergeOutputTdiff.h,
src/libsheet_core/include/coopy/Patcher.h,
src/testing/CMakeLists.txt, tests/book/contact_remove.csvs: cleaner
index format
2011-11-11 Paul Fitzpatrick <[email protected]>
* src/libsheet/PatchParser.cpp,
src/libsheet_core/MergeOutputTdiff.cpp,
src/libsheet_core/include/coopy/MergeOutputTdiff.h,
src/libsheet_core/include/coopy/Patcher.h: preserve tdiff foreign
keys declaration: <=> |table1.key1=|table2.key2|table3.key3|
2011-11-10 Paul Fitzpatrick <[email protected]>
* src/libsheet/Diff.cpp, src/libsheet/Options.cpp,
src/libsheet/PatchParser.cpp,
src/libsheet/include/coopy/PatchParser.h,
src/libsheet_core/Merger.cpp,
src/libsheet_core/include/coopy/CompareFlags.h,
src/ssdiff/ssrediff.cpp: support filter by insert/delete/update
2011-11-10 Paul Fitzpatrick <[email protected]>
* src/libsheet_core/DataBook.cpp,
src/libsheet_core/MergeOutputTdiff.cpp, src/testing/CMakeLists.txt,
tests/bug/rediff/patch.tdiff: rediffing bug: hunks with the same
column count but different column types could run-on into each other
incorrectly
2011-11-10 Paul Fitzpatrick <[email protected]>
* CoopyGuide.pdf, conf/CoopyDoc.cmake, conf/CoopyDocLatex.cmake,
conf/coopy_doxygen.conf.in, doc/cmd_coopy.dox, doc/cmd_ssdiff.dox,
doc/cmd_ssformat.dox, doc/cmd_ssmerge.dox, doc/cmd_sspatch.dox,
doc/cmd_ssrediff.dox, doc/cmd_ssresolve.dox, doc/main.dox,
doc/patch_format_csv.dox, doc/pdf_order.txt, doc/tutorial_diff.dox,
doc/tutorial_diff.paradox, packaging/linux/conf/compilers.sh,
scripts/fix_images.sh, scripts/process_dox.sh: doc update
2011-11-10 Paul Fitzpatrick <[email protected]>
* : doc update
2011-11-08 Paul Fitzpatrick <[email protected]>
* doc/cmd_coopy.dox, doc/cmd_ssdiff.dox, doc/cmd_ssformat.dox,
doc/cmd_ssmerge.dox, doc/cmd_sspatch.dox, doc/cmd_ssrediff.dox,
doc/cmd_ssresolve.dox, doc/tutorial_diff.dox: regenerate doc
2011-11-08 Paul Fitzpatrick <[email protected]>
* src/gui/src/coopy.cpp, src/testing/CMakeLists.txt: respect key
argument
2011-11-08 Paul Fitzpatrick <[email protected]>
* src/libsheet/Options.cpp: document clone/new
2011-11-06 Paul Fitzpatrick <[email protected]>
* src/testing/CMakeLists.txt, tests/review/review_all.ops: minimal
test for ops format
2011-11-06 Paul Fitzpatrick <[email protected]>
* src/libsheet_core/include/coopy/MergeOutputRowOps.h: missing
return value
2011-11-06 Paul Fitzpatrick <[email protected]>
* src/libsheet/Options.cpp: mention ops output format
2011-11-06 Paul Fitzpatrick <[email protected]>
* src/libsheet_core/CMakeLists.txt,
src/libsheet_core/MergeOutputRowOps.cpp,
src/libsheet_core/Patcher.cpp,
src/libsheet_core/include/coopy/MergeOutputRowOps.h: quickly pull
out rows affected by a diff
2011-11-06 Paul Fitzpatrick <[email protected]>
* src/libsheet_core/Merger.cpp, src/libsqlite/SqliteSheet.cpp:
sqlitesheet null token did not match other sheet types
2011-11-05 Paul Fitzpatrick <[email protected]>
* doc/related.dox: add more related projects
2011-11-04 Paul Fitzpatrick <[email protected]>
* CoopyGuide.pdf, conf/CoopyDoc.cmake, conf/CoopyDocLatex.cmake,
doc/pdf_order.txt, doc/tutorial_diff.dox, doc/tutorial_git.dox,
scripts/fix_order.sh: add pdf guide
2011-11-04 Paul Fitzpatrick <[email protected]>
* conf/CoopyDoc.cmake, scripts/fix_images.sh: add xpdf target
2011-11-04 Paul Fitzpatrick <[email protected]>
* conf/CoopyDescribe.cmake, conf/CoopyDoc.cmake,
conf/CoopyDocLatex.cmake, conf/coopy_doxygen.conf.in,
conf/coopy_source.txt.in, doc/cmd_coopy.dox, doc/cmd_ssdiff.dox,
doc/cmd_ssformat.dox, doc/cmd_ssmerge.dox, doc/cmd_sspatch.dox,
doc/cmd_ssrediff.dox, doc/cmd_ssresolve.dox, doc/pdf_order.txt,
doc/tutorial_coopy_conflict.dox, doc/tutorial_coopy_fork.dox,
doc/tutorial_coopy_new.dox, doc/tutorial_coopy_pull.dox,
doc/tutorial_coopy_push.dox, scripts/fix_images.sh,
scripts/fix_order.sh, scripts/make_pdf.sh, src/libsheet/Options.cpp:
better pdf documentation generation
2011-11-03 Paul Fitzpatrick <[email protected]>
* scripts/snap_coopy_base.sh, scripts/snap_coopy_conflict.sh,
scripts/snap_coopy_merge.sh: prepare example of coopy merge
2011-11-03 Paul Fitzpatrick <[email protected]>
* src/libsheet/Diff.cpp, src/libsheet/Options.cpp,
src/libsheet/PatchParser.cpp, src/libsheet/include/coopy/Options.h,
src/libsheet/include/coopy/PatchParser.h: allow sequence of --cmd
options to sspatch
2011-11-03 Paul Fitzpatrick <[email protected]>
* doc/main.dox, doc/tutorial_coopy_conflict.dox,
scripts/snap_coopy_base.sh, scripts/snap_coopy_conflict.sh: show
coopy under conflict
2011-11-03 Paul Fitzpatrick <[email protected]>
* scripts/snap_coopy_base.sh, scripts/snap_coopy_conflict.sh,
src/gui/src/coopy.cpp: show coopy conflict
2011-11-03 Paul Fitzpatrick <[email protected]>
* src/libgnumeric/GnumericSheet.cpp,
src/libsheet_core/SheetPatcher.cpp: highlight conflicts when colors
available
2011-11-03 Paul Fitzpatrick <[email protected]>
* src/libsheet/Options.cpp, src/libsheet_core/Merger.cpp,
src/testing/CMakeLists.txt, tests/examples/numbers_conflict.csv,
tests/examples/numbers_merge_neither.csv,
tests/examples/numbers_merge_ours.csv,
tests/examples/numbers_merge_theirs.csv: dust off and test merging
with 'neither' resolution
2011-11-02 Paul Fitzpatrick <[email protected]>
* scripts/test_coopy.sh, src/libsheet/CsvTextBook.cpp,
src/libsheet/Diff.cpp, src/libsheet/include/coopy/CsvTextBook.h,
src/libsheet_core/CsvWrite.cpp,
src/libsheet_core/include/coopy/CsvWrite.h,
src/ssfossil/src/csv_hooks.cpp, src/ssmerge/ssresolve.cpp,
src/testing/CMakeLists.txt, src/widesheet/WideSheetManager.cpp: deal
with conflicts in coopy
2011-11-02 Paul Fitzpatrick <[email protected]>
* scripts/test_coopy.sh, src/gui/src/coopy.cpp,
src/testing/CMakeLists.txt, src/widesheet/WideSheetManager.cpp:
fossil timestamp issues for coopy regression testing
2011-11-01 Paul Fitzpatrick <[email protected]>
* scripts/test_coopy.sh, src/gui/src/coopy.cpp,
src/testing/CMakeLists.txt, tests/coopy/mini-people.csvs: coopy test
for easy scenario
2011-11-01 Paul Fitzpatrick <[email protected]>
* : fossil repo for testing
2011-10-29 Paul Fitzpatrick <[email protected]>
* ChangeLog, scripts/make_packages.sh: seed neglected ChangeLog from
git2cl
2011-10-29 Paul Fitzpatrick <[email protected]>
* src/gui/src/coopy.cpp: fix osx path
2011-10-29 Paul Fitzpatrick <[email protected]>
* doc/tutorial_coopy_pull.dox: xref pull + new
2011-10-29 Paul Fitzpatrick <[email protected]>
* doc/tutorial_coopy_new.dox: fix line break
2011-10-29 Paul Fitzpatrick <[email protected]>
* conf/CoopyVersion.cmake, conf/coopy_doxygen.conf.in,
doc/funny_files.dox, doc/main.dox, doc/tutorial_coopy.dox,
doc/tutorial_coopy_fork.dox, doc/tutorial_coopy_new.dox,
doc/tutorial_coopy_pull.dox, doc/tutorial_coopy_push.dox,
scripts/snap_coopy.py, scripts/snap_coopy.sh,
scripts/snap_coopy_base.sh, scripts/snap_coopy_fork.sh,
scripts/snap_coopy_new.sh, scripts/snap_coopy_pull_push.sh,
scripts/snap_window.py, src/gui/src/coopy.cpp: more coopy gui doc
2011-10-28 Paul Fitzpatrick <[email protected]>
* doc/main.dox, doc/tutorial_coopy.dox, doc/tutorial_git.dox,
scripts/snap_coopy.sh, src/gui/src/coopy.cpp: more screenshots
2011-10-28 Paul Fitzpatrick <[email protected]>
* doc/tutorial_coopy.dox, scripts/snap_coopy.py,
scripts/snap_coopy.sh, scripts/snap_window.py,
src/gui/src/coopy.cpp: slowly cleaning up snapshots
2011-10-27 Paul Fitzpatrick <[email protected]>
* doc/cmd_sspatch.dox: add table option doc
2011-10-27 Paul Fitzpatrick <[email protected]>
* src/ssfossil/fossil/src/diffcmd.c: experiment with ssfossil diff
2011-10-27 Paul Fitzpatrick <[email protected]>
* src/libsheet/Options.cpp, src/libsheet_core/ColumnInfo.cpp,
src/libsheet_core/Dbg.cpp, src/libsheet_core/include/coopy/Dbg.h,
src/libsqlite/SqliteSheet.cpp, src/testing/CMakeLists.txt: recognize
blob types
2011-10-27 Paul Fitzpatrick <[email protected]>
* src/libsheet/Options.cpp, src/libsheet_core/DataBook.cpp,
src/libsheet_core/Patcher.cpp, src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/CompareFlags.h,
src/libsheet_core/include/coopy/Patcher.h,
src/libsheet_core/include/coopy/SheetPatcher.h,
src/testing/CMakeLists.txt, tests/book/contact_dreamer.csvs: support
table flag for sspatch
2011-10-27 Paul Fitzpatrick <[email protected]>
* doc/tutorial_coopy.dox, scripts/snap_coopy.py: more coopy doc
2011-10-27 Paul Fitzpatrick <[email protected]>
* doc/tutorial_coopy.dox: scrapy notes on initial repo write from
Coopy
2011-10-27 Paul Fitzpatrick <[email protected]>
* conf/coopy_doxygen.conf.in, doc/tutorial_coopy.dox,
scripts/snap_coopy.py, src/gui/src/coopy.cpp: coopy tutorial +
chisel demo
2011-10-27 Paul Fitzpatrick <[email protected]>
* src/libaccess/include/coopy/AccessSheet.h,
src/libaccess/include/coopy/AccessTextBook.h,
src/libsheet/Diff.cpp, src/libsheet/include/coopy/PolyBook.h,
src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/DataBook.h,
src/libsheet_core/include/coopy/PolySheet.h,
src/libsheet_core/include/coopy/SheetSchema.h: canWrite flag
2011-10-26 Paul Fitzpatrick <[email protected]>
* src/gui/src/coopy.cpp: prompt for username/password for writing,
if needed
2011-10-26 Paul Fitzpatrick <[email protected]>
* src/ssfossil/CMakeLists.txt, src/ssfossil/fossil/src/http_ssl.c:
enable ssl builds
2011-10-26 Paul Fitzpatrick <[email protected]>
* conf/CoopyDoc.cmake, doc/cmd_coopy.dox, doc/cmd_coopy.paradox,
doc/cmd_ssdiff.dox, doc/cmd_ssformat.dox, doc/cmd_ssmerge.dox,
doc/cmd_sspatch.dox, doc/cmd_ssrediff.dox, doc/cmd_ssresolve.dox,
doc/main.dox, doc/tutorial_coopy.dox, src/gui/src/coopy.cpp,
src/libsheet/Options.cpp, src/libsheet/include/coopy/Options.h:
freshen documentation for coopy command
2011-10-25 Paul Fitzpatrick <[email protected]>
* conf/CoopyDoc.cmake, doc/cmd_ssdiff.dox, doc/cmd_ssdiff.paradox,
doc/cmd_ssformat.dox, doc/cmd_ssformat.paradox,
doc/cmd_ssmerge.dox, doc/cmd_ssmerge.paradox, doc/cmd_sspatch.dox,
doc/cmd_sspatch.paradox, doc/cmd_ssrediff.dox,
doc/cmd_ssrediff.paradox, doc/cmd_ssresolve.dox,
doc/cmd_ssresolve.paradox, doc/main.dox, doc/tutorial_diff.dox,
scripts/process_dox.sh, src/libsheet/Options.cpp,
src/libsheet/include/coopy/Options.h,
src/libsheet_core/SheetPatcher.cpp, src/ssdiff/ssdiff.cpp,
src/ssdiff/ssrediff.cpp, src/ssformat/ssformat.cpp,
src/ssmerge/ssmerge.cpp, src/ssmerge/ssresolve.cpp,
src/sspatch/sspatch.cpp: add recipes/examples
2011-10-24 Paul Fitzpatrick <[email protected]>
* doc/cmd_ssformat.dox, doc/cmd_ssrediff.dox: regenerate man
2011-10-24 Paul Fitzpatrick <[email protected]>
* src/libsheet/Options.cpp: fix goof in dox generation
2011-10-24 Paul Fitzpatrick <[email protected]>
* doc/cmd_ssdiff.dox, doc/cmd_ssformat.dox, doc/cmd_ssmerge.dox,
doc/cmd_sspatch.dox, doc/cmd_ssrediff.dox: freshen man pages
2011-10-24 Paul Fitzpatrick <[email protected]>
* src/libsheet/Options.cpp: padding code wasn't portable
2011-10-24 Paul Fitzpatrick <[email protected]>
* conf/CoopyVersion.cmake, src/libsheet/Options.cpp: freshen doxygen
2011-10-24 Paul Fitzpatrick <[email protected]>
* src/libsheet/Options.cpp, src/ssmerge/ssmerge.cpp: add examples
for ssmerge
2011-10-24 Paul Fitzpatrick <[email protected]>
* src/libsheet/Diff.cpp, src/libsheet/Options.cpp,
src/libsheet/include/coopy/Coopy.h,
src/libsheet/include/coopy/Options.h,
src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/DataSheet.h,
src/libsheet_core/include/coopy/PolySheet.h,
src/libsheet_core/include/coopy/SheetPatcher.h,
src/libsheet_core/include/coopy/WrapBook.h, src/ssdiff/ssdiff.cpp,
src/ssmerge/ssmerge.cpp, src/sspatch/sspatch.cpp,
src/testing/CMakeLists.txt, tests/examples/numbers.csv,
tests/examples/numbers_buggy.csv,
tests/examples/numbers_buggy_add.csv,
tests/examples/numbers_more.csv: clean up examples for cli tools
2011-10-23 Paul Fitzpatrick <[email protected]>
* src/libsheet/Options.cpp, src/libsheet/PatchParser.cpp,
src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/SheetPatcher.h,
src/sspatch/sspatch.cpp: support --cmd '+ |v1|v2|' without named
columns
2011-10-23 Paul Fitzpatrick <[email protected]>
* src/libsheet/Options.cpp, src/libsheet/PatchParser.cpp: process
more sspatch --cmd strings
2011-10-23 Paul Fitzpatrick <[email protected]>
* bindings/coopy.i, src/libsheet/include/coopy/PolyBook.h: fix
bindings rust
2011-10-22 Paul Fitzpatrick <[email protected]>
* src/libsheet/Diff.cpp: fix merge crying wolf
2011-10-21 Paul Fitzpatrick <[email protected]>
* src/libsheet/Options.cpp,
src/libsheet_core/MergeOutputSqlDiff.cpp,
src/libsheet_core/Stringer.cpp,
src/libsheet_core/include/coopy/CompareFlags.h,
src/libsheet_core/include/coopy/MergeOutputSqlDiff.h: add --variant
access
2011-10-21 Paul Fitzpatrick <[email protected]>
* src/libaccess/AccessSheet.cpp: libmdb does not report correct
primary keys
2011-10-21 Paul Fitzpatrick <[email protected]>
* src/libsheet/Options.cpp: handle verbose flag consistently
2011-10-21 Paul Fitzpatrick <[email protected]>
* src/libaccess/AccessSheet.cpp, src/libsheet/Diff.cpp,
src/libsheet/Options.cpp, src/libsheet_core/BookCompare.cpp,
src/libsheet_core/Merger.cpp,
src/libsheet_core/include/coopy/SheetCell.h: add resolution option
during diff creation
2011-10-20 Paul Fitzpatrick <[email protected]>
* src/libsheet/Diff.cpp, src/libsheet/Options.cpp,
src/libsheet_core/BookCompare.cpp,
src/libsheet_core/include/coopy/SheetPatcher.h: working ssresolve,
modulo good quoting
2011-10-20 Paul Fitzpatrick <[email protected]>
* src/libsheet/Diff.cpp, src/libsheet/Options.cpp,
src/libsheet/include/coopy/Options.h,
src/libsheet_core/BookCompare.cpp,
src/libsheet_core/include/coopy/BookCompare.h,
src/libsheet_core/include/coopy/CompareFlags.h,
src/ssformat/ssformat.cpp, src/ssmerge/ssresolve.cpp: basic conflict
parse stub
2011-10-19 Paul Fitzpatrick <[email protected]>
* src/libsheet/include/coopy/Options.h,
src/libsheet_core/CMakeLists.txt, src/libsheet_core/PolySheet.cpp,
src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/include/coopy/PolySheet.h,
src/ssmerge/CMakeLists.txt, src/ssmerge/ssresolve.cpp,
src/testing/CMakeLists.txt,
tests/named_numbers_change_five_alt.csv,
tests/named_numbers_merge_header.csv: make sure inserted column name
shows up in in-place headers
2011-10-18 Paul Fitzpatrick <[email protected]>
* src/libsheet/Diff.cpp, src/libsheet_core/Merger.cpp,
src/libsheet_core/Patcher.cpp, src/libsheet_core/SheetPatcher.cpp,
src/libsheet_core/SheetSchema.cpp,
src/libsheet_core/include/coopy/Patcher.h,
src/libsheet_core/include/coopy/PolySheet.h,
src/libsheet_core/include/coopy/SheetPatcher.h,
src/libsheet_core/include/coopy/SheetSchema.h,
src/libsqlite/include/coopy/SqliteSheet.h,
src/testing/CMakeLists.txt: show merge conflicts more clearly in
tabular presentation (not just diff presentation)
2011-10-18 Paul Fitzpatrick <[email protected]>
* doc/tutorial_git.dox: fix typo cvs->csv
2011-10-18 Paul Fitzpatrick <[email protected]>
* conf/CoopyDoc.cmake, conf/coopy_doxygen.conf.in, doc/main.dox,
doc/tutorial_diff.paradox, scripts/generate_examples.sh,
scripts/process_dox.sh, src/libsheet/CsvFile.cpp,
src/libsheet/Options.cpp,
src/libsheet/include/coopy/ShortTextBook.h,
src/libsheet_core/Dbg.cpp, src/libsheet_core/SheetCompare.cpp,
src/libsheet_core/include/coopy/Dbg.h,
src/libsheet_core/include/coopy/MergeOutputSqlDiff.h,
src/libsheet_fold/FoldTool.cpp: add ssdiff tutorial
2011-10-18 Paul Fitzpatrick <[email protected]>
* scripts/generate_man.sh: update doxygen for individual commands
2011-10-18 Paul Fitzpatrick <[email protected]>
* doc/cmd_ssdiff.dox, doc/cmd_ssformat.dox, doc/cmd_ssmerge.dox,
doc/cmd_sspatch.dox, doc/cmd_ssrediff.dox,
doc/generated_examples/diff_example_bridge.dox,
doc/generated_examples/diff_example_named_delete_row.dox,
doc/generated_examples/diff_example_named_fix_a_cell.dox,
doc/generated_examples/diff_example_named_insert_column.dox,
doc/generated_examples/diff_example_named_insert_row.dox,
doc/generated_examples/diff_example_named_move_column.dox,
doc/generated_examples/diff_example_update_cell.dox,
doc/generated_examples/diff_example_xls_update_cell.dox,
doc/generated_examples/merge_example_altitude_typo_fix_and_reorder.
dox,
doc/generated_examples/merge_example_big_merge_with_lots_of_changes
.dox, doc/generated_examples/patch_example_bridge.dox,
doc/generated_examples/patch_example_named_delete_row.dox,
doc/generated_examples/patch_example_named_fix_a_cell.dox,
doc/generated_examples/patch_example_named_insert_column.dox,
doc/generated_examples/patch_example_named_insert_row.dox,
doc/generated_examples/patch_example_named_move_column.dox,
doc/generated_examples/patch_example_update_cell.dox,
doc/generated_examples/patch_example_xls_update_cell.dox,
doc/main.dox, doc/tutorial_git.dox, scripts/generate_examples.sh,
src/libsheet/BookHook.cpp.in, src/libsheet/Options.cpp,
src/libsheet/PolyBook.cpp, src/libsheet/include/coopy/Options.h,
src/libsheet/include/coopy/PolyBook.h, src/ssdiff/ssdiff.cpp,
src/ssdiff/ssrediff.cpp, src/ssformat/ssformat.cpp,
src/ssmerge/ssmerge.cpp, src/sspatch/sspatch.cpp: freshen doxygen
2011-10-17 Paul Fitzpatrick <[email protected]>
* src/libsheet/Options.cpp, src/ssformat/ssformat.cpp: update
ssformat options and usage
2011-10-17 Paul Fitzpatrick <[email protected]>