FossilBook

Check-in [66a40dbc2b]
Login

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

Overview
Comment:Commit version 1.6 with Branch & Merge chapter
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:66a40dbc2b6705993f951017167dcc4dbb6fafb8
User & Date: jim 2010-06-13 14:58:04
Context
2010-06-14
10:51
Branch chapter finished up to common changes check-in: eb421e2626 user: jim tags: trunk
2010-06-13
14:58
Commit version 1.6 with Branch & Merge chapter check-in: 66a40dbc2b user: jim tags: trunk
2010-06-11
16:38
[f05a10e7b1] finished work on last chapters check-in: 0fd53e648d user: noz tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Added Images/Advanced/Branching/branch.epsf.

cannot compute difference between binary files

Added Images/Advanced/Simple_Merge/marilyn_update.txt.























>
>
>
>
>
>
>
>
>
>
>
1
2
3
4
5
6
7
8
9
10
11
WhiteBook:jsonp marilyn$ fossil update
Autosync:  http://Marilyn@pandora.dyn-o-saur.com:8080/cgi-bin/jsonp.cgi
                Bytes      Cards  Artifacts     Deltas
Send:             130          1          0          0
Received:        1150         25          0          0
Send:             412          7          0          0
Received:        3274         31          1          5
Total network traffic: 843 bytes sent, 2709 bytes received
UPDATE json-src/qdj_token.c
UPDATE json-src/qdj_util.c
UPDATE main.c

Added Images/Advanced/Simple_Merge/simple_merge.txt.





















































































































>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
>
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
*** Before commit

551 jsonp> fossil commit -m "[d23bf4bbbb] Remove warnings"
Autosync:  http://jim@pandora.dyn-o-saur.com:8080/cgi-bin/jsonp.cgi
                Bytes      Cards  Artifacts     Deltas
Send:             130          1          0          0
Received:         874         19          0          0
Total network traffic: 339 bytes sent, 771 bytes received
fossil: would fork.  "update" first or use -f or --force.
552 jsonp> 

*** After commit

552 jsonp> fossil commit -m "[d23bf4bbbb] Remove warnings" -f
Autosync:  http://jim@pandora.dyn-o-saur.com:8080/cgi-bin/jsonp.cgi
                Bytes      Cards  Artifacts     Deltas
Send:             130          1          0          0
Received:         874         19          0          0
Total network traffic: 338 bytes sent, 771 bytes received
New_Version: 1beab955418a942ab9953c4865109ff46cbbd691
Autosync:  http://jim@pandora.dyn-o-saur.com:8080/cgi-bin/jsonp.cgi
                Bytes      Cards  Artifacts     Deltas
Send:            2646         25          0          4
Received:        1058         23          0          0
Total network traffic: 1498 bytes sent, 864 bytes received
**** warning: a fork has occurred *****

556 jsonp> fossil merge b72e96832e
UPDATE docs/qdj.lyx
UPDATE docs/qdj.pdf


556 jsonp> fossil merge b72e96832e
UPDATE docs/qdj.lyx
UPDATE docs/qdj.pdf
557 jsonp> fossil status
repository:   /Users/jschimpf/Public/FOSSIL/jsonp.fossil
local-root:   /Users/jschimpf/Public/jsonp/
server-code:  d3e7932b0b0f5e704264ba30adeae14978c08bc6
checkout:     1beab955418a942ab9953c4865109ff46cbbd691 2010-06-08 10:44:56 UTC
parent:       6edbaf5fa8e4d061c2e04e7fd481e7663b090bd3 2010-06-07 10:45:57 UTC
tags:         trunk
UPDATED_BY_MERGE docs/qdj.lyx
UPDATED_BY_MERGE docs/qdj.pdf
MERGED_WITH b72e96832e024f235696dcd6c5d0ddcc2cb38238
558 jsonp> fossil commit -m "After merging in changes"
Autosync:  http://jim@pandora.dyn-o-saur.com:8080/cgi-bin/jsonp.cgi
                Bytes      Cards  Artifacts     Deltas
Send:             130          1          0          0
Received:        1058         23          0          0
Total network traffic: 340 bytes sent, 864 bytes received
New_Version: 3d73c03edee33cdc2e1bd8a47de57b7a6b6d880a
Autosync:  http://jim@pandora.dyn-o-saur.com:8080/cgi-bin/jsonp.cgi
                Bytes      Cards  Artifacts     Deltas
Send:            1737         26          0          1
Received:        1104         24          0          0
Total network traffic: 1101 bytes sent, 888 bytes received
559 jsonp> 

Added Images/Advanced/file_merge/merge.epsf.

cannot compute difference between binary files

Changes to fossilbook.lyx.

1
2
3
4
5
6
7
8
...
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
...
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
...
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
...
930
931
932
933
934
935
936
937
938
939
940
941
942
943






































944
945
946
947
948
949
950
...
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
....
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
....
5826
5827
5828
5829
5830
5831
5832
5833















5834
5835

5836
5837
5838
5839
5840
5841
5842
....
6947
6948
6949
6950
6951
6952
6953






















































































































































































































































































































































































































































































































































































































































6954
6955
6956
6957
6958
6959
6960
#LyX 1.6.6.1 created this file. For more info see http://www.lyx.org/
\lyxformat 345
\begin_document
\begin_header
\textclass article
\begin_preamble

% Include the proper LaTeX packages:
................................................................................

\begin_layout Plain Layout


\backslash
renewcommand{
\backslash
revisionNumber}{1.5}
\end_layout

\end_inset


\end_layout

................................................................................
\end_layout

\begin_layout Author
Jim Schimpf
\end_layout

\begin_layout Date
7 June 2010
\end_layout

\begin_layout Standard
\begin_inset ERT
status open

\begin_layout Plain Layout
................................................................................
\shape default
.
\end_layout

\begin_layout Standard
\align center
\begin_inset Tabular
<lyxtabular version="3" rows="16" columns="4">
<features>
<column alignment="center" valignment="top" width="0.5in">
<column alignment="center" valignment="top" width="0.5in">
<column alignment="block" valignment="top" width="3in">
<column alignment="center" valignment="top" width="1in">
<row>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
................................................................................
7-Jun-2010
\end_layout

\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text

\begin_layout Plain Layout
1.5
\end_layout







































\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text

\begin_layout Plain Layout
js
................................................................................

\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text

\begin_layout Plain Layout
Move close leaf to adv use [2abc23dae5]
\end_layout

\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text

\begin_layout Plain Layout
7-Jun-2010
\end_layout

\end_inset
</cell>
</row>
</lyxtabular>

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

\end_inset


\end_layout

\begin_layout Section
Advanced Use
\end_layout

\begin_layout Subsection
Introduction
\end_layout

\begin_layout Standard
This chapter will introduce some advanced topics for Fossil use such as
 tagging and branching.

 Also it will show how to merge forks.
 Forks appear when you merge in files which include changes and differences
 from the repository version.
 This was illustrated in Section 
\begin_inset CommandInset ref
LatexCommand vref
reference "sub:Complications"

\end_inset

.
................................................................................
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
Fork/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.
................................................................................
\end_layout

\begin_layout Itemize
MERGE Implies file will be mixed text from repository and check out
\end_layout

\end_deeper






















































































































































































































































































































































































































































































































































































































































\begin_layout Section
Fossil Commands
\end_layout

\begin_layout Subsection
Introduction
\end_layout
|







 







|







 







|







 







|







 







|






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







 







|








|







 







|







<
|
>
|
|
|
<







 








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

<
>







 







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







1
2
3
4
5
6
7
8
...
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
...
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
...
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
...
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
...
990
991
992
993
994
995
996
997
998
999
1000
1001
1002
1003
1004
1005
1006
1007
1008
1009
1010
1011
1012
1013
....
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
....
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
....
6999
7000
7001
7002
7003
7004
7005
7006
7007
7008
7009
7010
7011
7012
7013
7014
7015
7016
7017
7018
7019
7020
7021
7022
7023
7024
7025
7026
7027
7028
7029
7030
7031
7032
7033
7034
7035
7036
7037
7038
7039
7040
7041
7042
7043
7044
7045
7046
7047
7048
7049
7050
7051
7052
7053
7054
7055
7056
7057
7058
7059
7060
7061
7062
7063
7064
7065
7066
7067
7068
7069
7070
7071
7072
7073
7074
7075
7076
7077
7078
7079
7080
7081
7082
7083
7084
7085
7086
7087
7088
7089
7090
7091
7092
7093
7094
7095
7096
7097
7098
7099
7100
7101
7102
7103
7104
7105
7106
7107
7108
7109
7110
7111
7112
7113
7114
7115
7116
7117
7118
7119
7120
7121
7122
7123
7124
7125
7126
7127
7128
7129
7130
7131
7132
7133
7134
7135
7136
7137
7138
7139
7140
7141
7142
7143
7144
7145
7146
7147
7148
7149
7150
7151
7152
7153
7154
7155
7156
7157
7158
7159
7160
7161
7162
7163
7164
7165
7166
7167
7168
7169
7170
7171
7172
7173
7174
7175
7176
7177
7178
7179
7180
7181
7182
7183
7184
7185
7186
7187
7188
7189
7190
7191
7192
7193
7194
7195
7196
7197
7198
7199
7200
7201
7202
7203
7204
7205
7206
7207
7208
7209
7210
7211
7212
7213
7214
7215
7216
7217
7218
7219
7220
7221
7222
7223
7224
7225
7226
7227
7228
7229
7230
7231
7232
7233
7234
7235
7236
7237
7238
7239
7240
7241
7242
7243
7244
7245
7246
7247
7248
7249
7250
7251
7252
7253
7254
7255
7256
7257
7258
7259
7260
7261
7262
7263
7264
7265
7266
7267
7268
7269
7270
7271
7272
7273
7274
7275
7276
7277
7278
7279
7280
7281
7282
7283
7284
7285
7286
7287
7288
7289
7290
7291
7292
7293
7294
7295
7296
7297
7298
7299
7300
7301
7302
7303
7304
7305
7306
7307
7308
7309
7310
7311
7312
7313
7314
7315
7316
7317
7318
7319
7320
7321
7322
7323
7324
7325
7326
7327
7328
7329
7330
7331
7332
7333
7334
7335
7336
7337
7338
7339
7340
7341
7342
7343
7344
7345
7346
7347
7348
7349
7350
7351
7352
7353
7354
7355
7356
7357
7358
7359
7360
7361
7362
7363
7364
7365
7366
7367
7368
7369
7370
7371
7372
7373
7374
7375
7376
7377
7378
7379
7380
7381
7382
7383
7384
7385
7386
7387
7388
7389
7390
7391
7392
7393
7394
7395
7396
7397
7398
7399
7400
7401
7402
7403
7404
7405
7406
7407
7408
7409
7410
7411
7412
7413
7414
7415
7416
7417
7418
7419
7420
7421
7422
7423
7424
7425
7426
7427
7428
7429
7430
7431
7432
7433
7434
7435
7436
7437
7438
7439
7440
7441
7442
7443
7444
7445
7446
7447
7448
7449
7450
7451
7452
7453
7454
7455
7456
7457
7458
7459
7460
7461
7462
7463
7464
7465
7466
7467
7468
7469
7470
7471
7472
7473
7474
7475
7476
7477
7478
7479
7480
7481
7482
7483
7484
7485
7486
7487
7488
7489
7490
7491
7492
7493
7494
7495
7496
7497
7498
7499
7500
7501
7502
7503
7504
7505
7506
7507
7508
7509
7510
7511
7512
7513
7514
7515
7516
7517
7518
7519
7520
7521
7522
7523
7524
7525
7526
7527
7528
7529
7530
7531
7532
7533
7534
7535
7536
7537
7538
7539
7540
7541
7542
7543
7544
7545
7546
7547
7548
7549
7550
7551
7552
7553
7554
7555
7556
7557
7558
7559
7560
7561
7562
7563
7564
7565
7566
7567
7568
7569
7570
7571
7572
7573
7574
7575
7576
7577
7578
7579
7580
7581
7582
7583
7584
7585
7586
7587
7588
7589
7590
7591
7592
7593
7594
7595
7596
7597
7598
7599
7600
7601
7602
7603
7604
7605
7606
7607
7608
7609
7610
7611
7612
7613
7614
7615
7616
7617
7618
7619
7620
7621
7622
7623
7624
7625
7626
7627
7628
7629
7630
7631
7632
7633
7634
7635
7636
7637
7638
7639
7640
7641
7642
#LyX 1.6.2 created this file. For more info see http://www.lyx.org/
\lyxformat 345
\begin_document
\begin_header
\textclass article
\begin_preamble

% Include the proper LaTeX packages:
................................................................................

\begin_layout Plain Layout


\backslash
renewcommand{
\backslash
revisionNumber}{1.6}
\end_layout

\end_inset


\end_layout

................................................................................
\end_layout

\begin_layout Author
Jim Schimpf
\end_layout

\begin_layout Date
13 June 2010
\end_layout

\begin_layout Standard
\begin_inset ERT
status open

\begin_layout Plain Layout
................................................................................
\shape default
.
\end_layout

\begin_layout Standard
\align center
\begin_inset Tabular
<lyxtabular version="3" rows="17" columns="4">
<features>
<column alignment="center" valignment="top" width="0.5in">
<column alignment="center" valignment="top" width="0.5in">
<column alignment="block" valignment="top" width="3in">
<column alignment="center" valignment="top" width="1in">
<row>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
................................................................................
7-Jun-2010
\end_layout

\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text

\begin_layout Plain Layout
1.5
\end_layout

\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text

\begin_layout Plain Layout
js
\end_layout

\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
\begin_inset Text

\begin_layout Plain Layout
Move close leaf to adv use [2abc23dae5]
\end_layout

\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text

\begin_layout Plain Layout
7-Jun-2010
\end_layout

\end_inset
</cell>
</row>
<row>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text

\begin_layout Plain Layout
1.6
\end_layout

\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text

\begin_layout Plain Layout
js
................................................................................

\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
\begin_inset Text

\begin_layout Plain Layout
Convert Advanced chapter to forks and branching
\end_layout

\end_inset
</cell>
<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
\begin_inset Text

\begin_layout Plain Layout
13-Jun-2010
\end_layout

\end_inset
</cell>
</row>
</lyxtabular>

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

\end_inset


\end_layout

\begin_layout Section
Forks & Branches
\end_layout

\begin_layout Subsection
Introduction
\end_layout

\begin_layout Standard

This chapter will cover forking and branching in Fossil.
 Forking is where you unintentially create two places to check into a repository.
 Branching is where you intentially do this because you want to maintain
 two or more versions of the code in the same repository.
 We illustrated forking and it's solutions in Section 

\begin_inset CommandInset ref
LatexCommand vref
reference "sub:Complications"

\end_inset

.
................................................................................
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 Standard
There is a good discussion of these topics on the Fossil Web site 
\begin_inset Flex URL
status collapsed

\begin_layout Plain Layout

http://www.fossil-scm.org/index.html/doc/tip/www/branching.wiki
\end_layout

\end_inset

.
\end_layout

\begin_layout Subsection

Forks, Branch & Merge
\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.
................................................................................
\end_layout

\begin_layout Itemize
MERGE Implies file will be mixed text from repository and check out
\end_layout

\end_deeper
\begin_layout Subsection
Branching
\end_layout

\begin_layout Subsubsection
Introduction
\end_layout

\begin_layout Standard
We have discussed this before but branching is the intential splitting of
 the code in the repository into multiple paths.
 This will usually be done with production code where we have maintenance
 branch and a development branch.
 The maintenance branch is in use and would get bug fixes based on experience.
 The development branch would get those changes if applicable plus be modified
 to add features.
\end_layout

\begin_layout Standard
The JSON code parser has been tested and works so will be released to general
 use.
 Also we wish to modify it to add support for UTF-8 characters so it matches
 the JSON standard.
 The current version just works with ASCII 7 bit characters which is not
 standard.
 We wish to split the code into a VER_1.0 branch which is the current code
 in use and VER_2.0 branch which will add UTF-8 character support.
\end_layout

\begin_layout Subsubsection
Branch the repository
\end_layout

\begin_layout Standard
Before proceeding we will make sure we have the current trunk code in our
 check out.
 
\end_layout

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

\begin_layout LyX-Code

\size footnotesize
[Pandora-2:jschimpf/Public/jsonp] jim% 
\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: 90c80f1a2da7360dae230ccec65ff82fe2eb160d
\end_layout

\begin_layout LyX-Code

\size footnotesize
checkout: 
\series bold
462156b283
\series default
b694af0b99c9b446b64d3f77436fbb 2010-06-09 14:16:42 UTC
\end_layout

\begin_layout LyX-Code

\size footnotesize
parent: fbb16491e2ff9f9ca3a98adffa167de1b6903a44 2010-06-09 14:02:28 UTC
\end_layout

\begin_layout LyX-Code

\series bold
\size footnotesize
tags: trunk
\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
Checking code status
\end_layout

\end_inset


\end_layout

\end_inset


\end_layout

\begin_layout Standard
Seeing that matches the latest leaf in the time line we can proceed to branch
 the code.
\end_layout

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

\begin_layout LyX-Code

\size footnotesize
[Pandora-2:jschimpf/Public/jsonp] jim% 
\series bold
fossil branch new VER_1.0 trunk -bgcolor 0xFFC0FF
\end_layout

\begin_layout LyX-Code

\size footnotesize
sh: gpg: command not found
\end_layout

\begin_layout LyX-Code

\size footnotesize
unable to sign manifest.
  continue (y/N)? y
\end_layout

\begin_layout LyX-Code

\size footnotesize
New branch: 65e1f48633d691a5ea738cd51ccbf9a581dfb3c7
\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:            2391         42          0          1
\end_layout

\begin_layout LyX-Code

\size footnotesize
Received:        1840         40          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Total network traffic: 1524 bytes sent, 1272 bytes received
\end_layout

\begin_layout LyX-Code

\size footnotesize
[Pandora-2:jschimpf/Public/jsonp] jim% 
\series bold
fossil branch new VER_2.0 trunk -bgcolor 0xC0F0FF
\end_layout

\begin_layout LyX-Code

\size footnotesize
sh: gpg: command not found
\end_layout

\begin_layout LyX-Code

\size footnotesize
unable to sign manifest.
  continue (y/N)? y
\end_layout

\begin_layout LyX-Code

\size footnotesize
New branch: a1737916ec2df696a0f3a7e36edf9ba4370e48a7
\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:            2437         43          0          1
\end_layout

\begin_layout LyX-Code

\size footnotesize
Received:        1886         41          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Total network traffic: 1550 bytes sent, 1271 bytes received
\end_layout

\begin_layout LyX-Code

\size footnotesize
[Pandora-2:jschimpf/Public/jsonp] jim% 
\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
Branch commands
\end_layout

\end_inset


\end_layout

\end_inset


\end_layout

\begin_layout Standard
What was just done.
 We used the Fossil branch command to create two branches VER_1.0 and VER_2.0
 and assigned each of them a color.
 We can see the timeline is now:
\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 /Users/jim/Desktop/FossilBook/Images/Advanced/Branching/branch.epsf
	scale 60

\end_inset


\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
Branch Timeline
\end_layout

\end_inset


\end_layout

\end_inset


\end_layout

\begin_layout Subsubsection
Check out the branches
\end_layout

\begin_layout Standard
Now the the repository is branched we can check out the two sets of code
 into different directories.
 We create jsonp1 and jsonp2 and proceed to open the different branches
 into them.
\end_layout

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

\begin_layout LyX-Code

\size footnotesize
[Pandora-2:jschimpf/Public/jsonp1] 
\series bold
jim% fossil open ../FOSSIL/jsonp.fossil VER_1.0
\end_layout

\begin_layout LyX-Code

\size footnotesize
docs/qdj.lyx
\end_layout

\begin_layout LyX-Code

\size footnotesize
docs/qdj.pdf
\end_layout

\begin_layout LyX-Code

\size footnotesize
json-src/qdj.c
\end_layout

\begin_layout LyX-Code

\size footnotesize
json-src/qdj.h
\end_layout

\begin_layout LyX-Code

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

\begin_layout LyX-Code

\size footnotesize
json-src/qdj_token.h
\end_layout

\begin_layout LyX-Code

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

\begin_layout LyX-Code

\size footnotesize
main.c
\end_layout

\begin_layout LyX-Code

\size footnotesize
makefile
\end_layout

\begin_layout LyX-Code

\size footnotesize
obj/test.txt
\end_layout

\begin_layout LyX-Code

\size footnotesize
test.txt
\end_layout

\begin_layout LyX-Code

\size footnotesize
project-name: JASONP
\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/jsonp1/
\end_layout

\begin_layout LyX-Code

\size footnotesize
project-code: eb6084c8ab115cf2b28a129c7183731002c6143a
\end_layout

\begin_layout LyX-Code

\size footnotesize
server-code:  90c80f1a2da7360dae230ccec65ff82fe2eb160d
\end_layout

\begin_layout LyX-Code

\size footnotesize
checkout:     65e1f48633d691a5ea738cd51ccbf9a581dfb3c7 2010-06-13 10:13:55
 UTC
\end_layout

\begin_layout LyX-Code

\size footnotesize
parent:       462156b283b694af0b99c9b446b64d3f77436fbb 2010-06-09 14:16:42
 UTC
\end_layout

\begin_layout LyX-Code

\size footnotesize
tags:         VER_1.0
\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
Check out VER_1.0
\end_layout

\end_inset


\end_layout

\end_inset


\end_layout

\begin_layout Standard
Checking out VER_2.0 in the same way
\end_layout

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

\begin_layout LyX-Code

\size footnotesize
[Pandora-2:jschimpf/Public/jsonp2] jim% 
\series bold
fossil open ../FOSSIL/jsonp.fossil VER_2.0
\end_layout

\begin_layout LyX-Code

\size footnotesize
docs/qdj.lyx
\end_layout

\begin_layout LyX-Code

\size footnotesize
docs/qdj.pdf
\end_layout

\begin_layout LyX-Code

\size footnotesize
json-src/qdj.c
\end_layout

\begin_layout LyX-Code

\size footnotesize
json-src/qdj.h
\end_layout

\begin_layout LyX-Code

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

\begin_layout LyX-Code

\size footnotesize
json-src/qdj_token.h
\end_layout

\begin_layout LyX-Code

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

\begin_layout LyX-Code

\size footnotesize
main.c
\end_layout

\begin_layout LyX-Code

\size footnotesize
makefile
\end_layout

\begin_layout LyX-Code

\size footnotesize
obj/test.txt
\end_layout

\begin_layout LyX-Code

\size footnotesize
test.txt
\end_layout

\begin_layout LyX-Code

\size footnotesize
project-name: JASONP
\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/jsonp2/
\end_layout

\begin_layout LyX-Code

\size footnotesize
project-code: eb6084c8ab115cf2b28a129c7183731002c6143a
\end_layout

\begin_layout LyX-Code

\size footnotesize
server-code:  90c80f1a2da7360dae230ccec65ff82fe2eb160d
\end_layout

\begin_layout LyX-Code

\size footnotesize
checkout:     a1737916ec2df696a0f3a7e36edf9ba4370e48a7 2010-06-13 10:14:26
 UTC
\end_layout

\begin_layout LyX-Code

\size footnotesize
parent:       462156b283b694af0b99c9b446b64d3f77436fbb 2010-06-09 14:16:42
 UTC
\end_layout

\begin_layout LyX-Code

\size footnotesize
tags:         VER_2.0
\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
VER_2.0 checkout
\end_layout

\end_inset


\end_layout

\end_inset


\end_layout

\begin_layout Standard
Notice on both of these the tags show which branch we are attached to.
\end_layout

\begin_layout Subsubsection
Commands used
\end_layout

\begin_layout Itemize

\series bold
fossil branch 
\series default
Used to generate a branch of the repository.
 The command can optionally color the branch in the display.
\end_layout

\begin_layout Section
Fossil Commands
\end_layout

\begin_layout Subsection
Introduction
\end_layout

Changes to fossilbook.pdf.

cannot compute difference between binary files