FossilBook

Check-in [6297355765]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:made one fix on page 54 of 73
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:6297355765a09a49deb874c1f4fbea9bc29dd0ed
User & Date: noz 2010-06-10 18:44:48
Context
2010-06-10
19:27
made one fix on page 55 of 73 check-in: e4cf720d95 user: noz tags: trunk
18:44
made one fix on page 54 of 73 check-in: 6297355765 user: noz tags: trunk
18:12
made one fix on page 49 of 73 check-in: 9b92bfd593 user: noz tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to fossilbook.lyx.

8762
8763
8764
8765
8766
8767
8768
8769
8770
8771
8772
8773
8774
8775
8776

\end_inset


\end_layout

\begin_layout Standard
This is used to undo the last update,merge or revert operation.
 
\end_layout

\begin_layout Standard
\begin_inset Float figure
placement H
wide false







|







8762
8763
8764
8765
8766
8767
8768
8769
8770
8771
8772
8773
8774
8775
8776

\end_inset


\end_layout

\begin_layout Standard
This is used to undo the last update, merge, or revert operation.
 
\end_layout

\begin_layout Standard
\begin_inset Float figure
placement H
wide false

Changes to fossilbook.lyx~.

5756
5757
5758
5759
5760
5761
5762
5763






5764
5765
5766
5767




5768
































































































































































































































































































































































































































































































































































































































































































































































5769
5770
5771
5772
5773
5774
5775
....
6922
6923
6924
6925
6926
6927
6928
6929
6930
6931
6932
6933
6934
6935
6936
 version both served from the same repository.
 In this case development changes should only be checked into the development
 branch.
 Maintanence changes might have to be checked into both.
\end_layout

\begin_layout Standard
Instead of using the book repository for these examples we will use a simple






 C program that has a number of files.
 This will make it simpler to illustrate branching and tagging.
\end_layout





\begin_layout Standard

































































































































































































































































































































































































































































































































































































































































































































































\end_layout

\begin_layout Paragraph
Merge with external tools
\end_layout

................................................................................


\end_layout

\begin_layout Standard
The add command is used to add files into a repository.
 It is recursive and will pull in all files in subdirectories of the current.
 Fossil will not all files already present in the repository so it is safe
 to add all files at any time.
 Only new files will be added.
\end_layout

\begin_layout Standard
\begin_inset Float figure
placement H







|
>
>
>
>
>
>
|



>
>
>
>

>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>







 







|







5756
5757
5758
5759
5760
5761
5762
5763
5764
5765
5766
5767
5768
5769
5770
5771
5772
5773
5774
5775
5776
5777
5778
5779
5780
5781
5782
5783
5784
5785
5786
5787
5788
5789
5790
5791
5792
5793
5794
5795
5796
5797
5798
5799
5800
5801
5802
5803
5804
5805
5806
5807
5808
5809
5810
5811
5812
5813
5814
5815
5816
5817
5818
5819
5820
5821
5822
5823
5824
5825
5826
5827
5828
5829
5830
5831
5832
5833
5834
5835
5836
5837
5838
5839
5840
5841
5842
5843
5844
5845
5846
5847
5848
5849
5850
5851
5852
5853
5854
5855
5856
5857
5858
5859
5860
5861
5862
5863
5864
5865
5866
5867
5868
5869
5870
5871
5872
5873
5874
5875
5876
5877
5878
5879
5880
5881
5882
5883
5884
5885
5886
5887
5888
5889
5890
5891
5892
5893
5894
5895
5896
5897
5898
5899
5900
5901
5902
5903
5904
5905
5906
5907
5908
5909
5910
5911
5912
5913
5914
5915
5916
5917
5918
5919
5920
5921
5922
5923
5924
5925
5926
5927
5928
5929
5930
5931
5932
5933
5934
5935
5936
5937
5938
5939
5940
5941
5942
5943
5944
5945
5946
5947
5948
5949
5950
5951
5952
5953
5954
5955
5956
5957
5958
5959
5960
5961
5962
5963
5964
5965
5966
5967
5968
5969
5970
5971
5972
5973
5974
5975
5976
5977
5978
5979
5980
5981
5982
5983
5984
5985
5986
5987
5988
5989
5990
5991
5992
5993
5994
5995
5996
5997
5998
5999
6000
6001
6002
6003
6004
6005
6006
6007
6008
6009
6010
6011
6012
6013
6014
6015
6016
6017
6018
6019
6020
6021
6022
6023
6024
6025
6026
6027
6028
6029
6030
6031
6032
6033
6034
6035
6036
6037
6038
6039
6040
6041
6042
6043
6044
6045
6046
6047
6048
6049
6050
6051
6052
6053
6054
6055
6056
6057
6058
6059
6060
6061
6062
6063
6064
6065
6066
6067
6068
6069
6070
6071
6072
6073
6074
6075
6076
6077
6078
6079
6080
6081
6082
6083
6084
6085
6086
6087
6088
6089
6090
6091
6092
6093
6094
6095
6096
6097
6098
6099
6100
6101
6102
6103
6104
6105
6106
6107
6108
6109
6110
6111
6112
6113
6114
6115
6116
6117
6118
6119
6120
6121
6122
6123
6124
6125
6126
6127
6128
6129
6130
6131
6132
6133
6134
6135
6136
6137
6138
6139
6140
6141
6142
6143
6144
6145
6146
6147
6148
6149
6150
6151
6152
6153
6154
6155
6156
6157
6158
6159
6160
6161
6162
6163
6164
6165
6166
6167
6168
6169
6170
6171
6172
6173
6174
6175
6176
6177
6178
6179
6180
6181
6182
6183
6184
6185
6186
6187
6188
6189
6190
6191
6192
6193
6194
6195
6196
6197
6198
6199
6200
6201
6202
6203
6204
6205
6206
6207
6208
6209
6210
6211
6212
6213
6214
6215
6216
6217
6218
6219
6220
6221
6222
6223
6224
6225
6226
6227
6228
6229
6230
6231
6232
6233
6234
6235
6236
6237
6238
6239
6240
6241
6242
6243
6244
6245
6246
6247
6248
6249
6250
6251
6252
6253
6254
6255
6256
6257
6258
6259
6260
6261
6262
6263
6264
6265
6266
6267
6268
6269
6270
6271
6272
6273
6274
6275
6276
6277
6278
6279
6280
6281
6282
6283
6284
6285
6286
6287
6288
6289
6290
6291
6292
6293
6294
6295
6296
6297
6298
6299
6300
6301
6302
6303
6304
6305
6306
6307
6308
6309
6310
6311
6312
6313
6314
6315
6316
6317
6318
6319
6320
6321
6322
6323
6324
6325
6326
6327
6328
6329
6330
6331
6332
6333
6334
6335
6336
6337
6338
6339
6340
6341
6342
6343
6344
6345
6346
6347
6348
6349
6350
6351
6352
6353
6354
6355
6356
6357
6358
6359
6360
6361
6362
6363
6364
6365
6366
6367
6368
6369
6370
6371
6372
6373
6374
6375
6376
6377
6378
6379
6380
6381
6382
6383
6384
6385
6386
6387
6388
6389
6390
6391
6392
6393
6394
6395
6396
6397
6398
6399
6400
6401
6402
6403
6404
6405
6406
6407
6408
6409
6410
6411
6412
6413
6414
6415
6416
6417
6418
6419
6420
6421
6422
6423
6424
6425
6426
6427
6428
6429
6430
6431
6432
6433
6434
6435
6436
6437
6438
6439
6440
6441
6442
6443
6444
6445
6446
6447
6448
6449
6450
6451
6452
6453
6454
6455
6456
6457
6458
6459
6460
6461
6462
6463
6464
6465
6466
6467
6468
6469
6470
6471
6472
6473
6474
6475
6476
6477
6478
6479
6480
6481
6482
6483
6484
6485
6486
6487
6488
6489
6490
6491
6492
6493
6494
6495
6496
6497
6498
6499
6500
6501
6502
6503
6504
6505
6506
6507
6508
6509
6510
6511
6512
6513
6514
6515
6516
6517
6518
6519
6520
6521
....
7668
7669
7670
7671
7672
7673
7674
7675
7676
7677
7678
7679
7680
7681
7682
 version both served from the same repository.
 In this case development changes should only be checked into the development
 branch.
 Maintanence changes might have to be checked into both.
\end_layout

\begin_layout Standard
Instead of using the book repository for these examples we will use a JSON
\begin_inset CommandInset citation
LatexCommand cite
key "JSON"

\end_inset

parser program that has a number of files and documentation.
 This will make it simpler to illustrate branching and tagging.
\end_layout

\begin_layout Subsection
Simple Merge Case
\end_layout

\begin_layout Standard
In this case the JSON code has just been placed in Fossil and two developers
 check out copies to work on.
 Jim wants to fix a number of compiler warnings that appear and Marilyn
 wants to fix the documentation.
 In both cases they proceeed as shown in Chapter 
\begin_inset CommandInset ref
LatexCommand vref
reference "sec:Multiple-Users"

\end_inset

.
 The JSON code has been placed in distributed location, each of them clones
 the repository and opens a working copy of the code.
\end_layout

\begin_layout Subsubsection
Marilyn's Actions
\end_layout

\begin_layout Standard
She looks through the documentation and finds a number of problems and fixes
 them (the documentation uses LyX and PDF's).
 So she is satisfied with what she has done and checks this in:
\end_layout

\begin_layout Standard
\begin_inset Float figure
placement H
wide false
sideways false
status open

\begin_layout Plain Layout
\begin_inset Graphics
	filename Images/Advanced/Simple_Merge/sm_Marilyn.epsf
	scale 60

\end_inset


\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
\begin_inset CommandInset label
LatexCommand label
name "fig:Marilyn's-work"

\end_inset

Marilyn's work
\end_layout

\end_inset


\end_layout

\begin_layout Plain Layout

\end_layout

\end_inset


\end_layout

\begin_layout Subsubsection
Jim's Actions
\end_layout

\begin_layout Standard
At the same time, Jim gets a working copy of version [6edbaf5fa8] of the
 code, puts in a ticket [d23bf4bbbb] as shown in Figure 
\begin_inset CommandInset ref
LatexCommand ref
reference "fig:Marilyn's-work"

\end_inset

.
 After fixing the warnings, Jim is done and goes to commit, he does this
 AFTER Marilyn has done her commit.
\end_layout

\begin_layout Standard
\begin_inset Float figure
placement H
wide false
sideways false
status open

\begin_layout LyX-Code

\size footnotesize
551 jsonp> 
\series bold
fossil commit -m "[d23bf4bbbb] Remove warnings"
\end_layout

\begin_layout LyX-Code

\size footnotesize
Autosync:  http://jim@pandora.dyn-o-saur.com:8080/cgi-bin/jsonp.cgi
\end_layout

\begin_layout LyX-Code

\size footnotesize
                Bytes      Cards  Artifacts     Deltas
\end_layout

\begin_layout LyX-Code

\size footnotesize
Send:             130          1          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Received:         874         19          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Total network traffic: 339 bytes sent, 771 bytes received
\end_layout

\begin_layout LyX-Code

\size footnotesize
fossil: would fork.
  "update" first or use -f or --force.
\end_layout

\begin_layout LyX-Code

\size footnotesize
552 jsonp> 
\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
Jim's commit attempt
\end_layout

\end_inset


\end_layout

\begin_layout Plain Layout

\end_layout

\end_inset


\end_layout

\begin_layout Standard
At this point Fossil recognizes that Marilyn has changed the repository
 (she updated the documentation) but Jim does not have these changes because
 he checked out an earlier version of the code.
 Jim says he 
\series bold
must
\series default
 get his changes in so he does a FORCE to force fossil to accept the commit.
\end_layout

\begin_layout Standard
\begin_inset Float figure
placement H
wide false
sideways false
status open

\begin_layout LyX-Code

\size footnotesize
552 jsonp> 
\series bold
fossil
\series default
 
\series bold
commit -m "[d23bf4bbbb] Remove warnings" -f
\end_layout

\begin_layout LyX-Code

\size footnotesize
Autosync:  http://jim@pandora.dyn-o-saur.com:8080/cgi-bin/jsonp.cgi
\end_layout

\begin_layout LyX-Code

\size footnotesize
                Bytes      Cards  Artifacts     Deltas
\end_layout

\begin_layout LyX-Code

\size footnotesize
Send:             130          1          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Received:         874         19          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Total network traffic: 338 bytes sent, 771 bytes received
\end_layout

\begin_layout LyX-Code

\size footnotesize
New_Version: 1beab955418a942ab9953c4865109ff46cbbd691
\end_layout

\begin_layout LyX-Code

\size footnotesize
Autosync:  http://jim@pandora.dyn-o-saur.com:8080/cgi-bin/jsonp.cgi
\end_layout

\begin_layout LyX-Code

\size footnotesize
                Bytes      Cards  Artifacts     Deltas
\end_layout

\begin_layout LyX-Code

\size footnotesize
Send:            2646         25          0          4
\end_layout

\begin_layout LyX-Code

\size footnotesize
Received:        1058         23          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Total network traffic: 1498 bytes sent, 864 bytes received
\end_layout

\begin_layout LyX-Code

\size footnotesize
**** warning: a fork has occurred *****
\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
Forcing the commit
\end_layout

\end_inset


\end_layout

\begin_layout Plain Layout

\end_layout

\end_inset


\end_layout

\begin_layout Standard
Looking at the timeline Jim sees this:
\end_layout

\begin_layout Standard
\begin_inset Float figure
placement H
wide false
sideways false
status open

\begin_layout Plain Layout
\begin_inset Graphics
	filename Images/Advanced/Simple_Merge/sm_jim_fork.epsf
	scale 60

\end_inset


\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
Repository Fork
\end_layout

\end_inset


\end_layout

\begin_layout Plain Layout

\end_layout

\end_inset


\end_layout

\begin_layout Standard
Not good, there are two 
\series bold
Leaf
\series default
's and Marilyn would commit code to her fork and Jim would be commiting
 code to his.
 So Jim must fix this by merging the code.
 Jim wants to merge versions [b72e96832e] of Marilyn and his [1beab85441].
\end_layout

\begin_layout Subsubsection
Fixing the fork
\end_layout

\begin_layout Standard
So Jim who's checked out code is from Leaf [1beab85441] does a merge with
 Marilyn's leaf [b72e96832e] like so:
\end_layout

\begin_layout Standard
\begin_inset Float figure
placement H
wide false
sideways false
status open

\begin_layout LyX-Code

\size footnotesize
556 jsonp> 
\series bold
fossil merge b72e96832e
\end_layout

\begin_layout LyX-Code

\size footnotesize
UPDATE docs/qdj.lyx
\end_layout

\begin_layout LyX-Code

\size footnotesize
UPDATE docs/qdj.pdf
\end_layout

\begin_layout LyX-Code

\size footnotesize
557 jsonp> 
\series bold
fossil status
\end_layout

\begin_layout LyX-Code

\size footnotesize
repository:   /Users/jschimpf/Public/FOSSIL/jsonp.fossil
\end_layout

\begin_layout LyX-Code

\size footnotesize
local-root:   /Users/jschimpf/Public/jsonp/
\end_layout

\begin_layout LyX-Code

\size footnotesize
server-code:  d3e7932b0b0f5e704264ba30adeae14978c08bc6
\end_layout

\begin_layout LyX-Code

\size footnotesize
checkout:     1beab955418a942ab9953c4865109ff46cbbd691 2010-06-08 10:44:56
 UTC
\end_layout

\begin_layout LyX-Code

\size footnotesize
parent:       6edbaf5fa8e4d061c2e04e7fd481e7663b090bd3 2010-06-07 10:45:57
 UTC
\end_layout

\begin_layout LyX-Code

\size footnotesize
tags:         trunk
\end_layout

\begin_layout LyX-Code

\size footnotesize
UPDATED_BY_MERGE docs/qdj.lyx
\end_layout

\begin_layout LyX-Code

\size footnotesize
UPDATED_BY_MERGE docs/qdj.pdf
\end_layout

\begin_layout LyX-Code

\size footnotesize
MERGED_WITH b72e96832e024f235696dcd6c5d0ddcc2cb38238
\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
\begin_inset CommandInset label
LatexCommand label
name "fig:Merge-Operation"

\end_inset

Merge Operation
\end_layout

\end_inset


\end_layout

\begin_layout Plain Layout

\end_layout

\end_inset


\end_layout

\begin_layout Standard
As shown the two documentation files are updated, there are no merge conflicts
 as Jim didn't touch these files and Marilyn didn't touch the code files.
\end_layout

\begin_layout Standard
Next Jim does a commit to make this new merged set of files the new trunk.
 Rememeber doing the merge shown in Figure 
\begin_inset CommandInset ref
LatexCommand ref
reference "fig:Merge-Operation"

\end_inset

 just updates your checked out code and does not change the repository till
 you check it in.
\end_layout

\begin_layout Standard
\begin_inset Float figure
placement H
wide false
sideways false
status open

\begin_layout LyX-Code

\size footnotesize
558 jsonp> fossil 
\series bold
commit -m "After merging in changes"
\end_layout

\begin_layout LyX-Code

\size footnotesize
Autosync:  http://jim@pandora.dyn-o-saur.com:8080/cgi-bin/jsonp.cgi
\end_layout

\begin_layout LyX-Code

\size footnotesize
                Bytes      Cards  Artifacts     Deltas
\end_layout

\begin_layout LyX-Code

\size footnotesize
Send:             130          1          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Received:        1058         23          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Total network traffic: 340 bytes sent, 864 bytes received
\end_layout

\begin_layout LyX-Code

\size footnotesize
New_Version: 3d73c03edee33cdc2e1bd8a47de57b7a6b6d880a
\end_layout

\begin_layout LyX-Code

\size footnotesize
Autosync:  http://jim@pandora.dyn-o-saur.com:8080/cgi-bin/jsonp.cgi
\end_layout

\begin_layout LyX-Code

\size footnotesize
                Bytes      Cards  Artifacts     Deltas
\end_layout

\begin_layout LyX-Code

\size footnotesize
Send:            1737         26          0          1
\end_layout

\begin_layout LyX-Code

\size footnotesize
Received:        1104         24          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Total network traffic: 1101 bytes sent, 888 bytes received
\end_layout

\begin_layout LyX-Code

\size footnotesize
559 jsonp> 
\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
Commit after merge
\end_layout

\end_inset


\end_layout

\begin_layout Plain Layout

\end_layout

\end_inset


\end_layout

\begin_layout Standard
When we look at the timeline we have a single leaf for future code commits.
\end_layout

\begin_layout Standard
\begin_inset Float figure
placement H
wide false
sideways false
status open

\begin_layout Plain Layout
\begin_inset Graphics
	filename Images/Advanced/Simple_Merge/sm_after_merge.epsf
	scale 60

\end_inset


\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
After merge timeline
\end_layout

\end_inset


\end_layout

\begin_layout Plain Layout

\end_layout

\end_inset


\end_layout

\begin_layout Standard
The only other thing remaining is that Marilyn does an Update before proceeding
 so her checked out code matches the repository.
\end_layout

\begin_layout Standard
\begin_inset Float figure
placement H
wide false
sideways false
status open

\begin_layout LyX-Code

\size footnotesize
WhiteBook:jsonp marilyn$ 
\series bold
fossil update
\end_layout

\begin_layout LyX-Code

\size footnotesize
Autosync:  http://Marilyn@pandora.dyn-o-saur.com:8080/cgi-bin/jsonp.cgi
\end_layout

\begin_layout LyX-Code

\size footnotesize
                Bytes      Cards  Artifacts     Deltas
\end_layout

\begin_layout LyX-Code

\size footnotesize
Send:             130          1          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Received:        1150         25          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Send:             412          7          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Received:        3274         31          1          5
\end_layout

\begin_layout LyX-Code

\size footnotesize
Total network traffic: 843 bytes sent, 2709 bytes received
\end_layout

\begin_layout LyX-Code

\size footnotesize
UPDATE json-src/qdj_token.c
\end_layout

\begin_layout LyX-Code

\size footnotesize
UPDATE json-src/qdj_util.c
\end_layout

\begin_layout LyX-Code

\size footnotesize
UPDATE main.c
\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
Marilyn's Update
\end_layout

\end_inset


\end_layout

\begin_layout Plain Layout

\end_layout

\end_inset


\end_layout

\begin_layout Paragraph
Merge with external tools
\end_layout

................................................................................


\end_layout

\begin_layout Standard
The add command is used to add files into a repository.
 It is recursive and will pull in all files in subdirectories of the current.
 Fossil will not ???? OVERWRITE ANY OF THE ???? all files already present in the repository so it is safe
 to add all files at any time.
 Only new files will be added.
\end_layout

\begin_layout Standard
\begin_inset Float figure
placement H