FossilBook

Check-in [eb421e2626]
Login

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

Overview
Comment:Branch chapter finished up to common changes
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:eb421e26267630c2c14b36ae37919f334e59d5a8
User & Date: jim 2010-06-14 10:51:37
Context
2010-06-26
12:28
Added section on TH scripting [b832f46d31] check-in: 9ad19c40d6 user: jim tags: trunk
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
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Added Images/Advanced/Branching/color_setup.epsf.

cannot compute difference between binary files

Added Images/Advanced/Branching/current_state.epsf.

cannot compute difference between binary files

Changes to fossilbook.lyx.

7248
7249
7250
7251
7252
7253
7254







7255
7256
7257
7258
7259
7260
7261
....
7276
7277
7278
7279
7280
7281
7282
7283
7284
7285
7286
7287
7288
7289
7290
....
7300
7301
7302
7303
7304
7305
7306











































































7307
7308
7309
7310
7311
7312
7313
....
7440
7441
7442
7443
7444
7445
7446


7447
7448
7449
7450
7451
7452
7453
7454
....
7592
7593
7594
7595
7596
7597
7598


7599
7600
7601
7602
7603
7604
7605
7606
....
7614
7615
7616
7617
7618
7619
7620

















































































































































































































































































































































7621
7622
7623
7624
7625
7626
7627
\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
Branch commands







\end_layout

\end_inset


\end_layout

................................................................................
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

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

\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
................................................................................
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
................................................................................
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_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







>
>
>
>
>
>
>







 







|







 







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







 







>
>
|







 







>
>
|







 







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







7248
7249
7250
7251
7252
7253
7254
7255
7256
7257
7258
7259
7260
7261
7262
7263
7264
7265
7266
7267
7268
....
7283
7284
7285
7286
7287
7288
7289
7290
7291
7292
7293
7294
7295
7296
7297
....
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
....
7522
7523
7524
7525
7526
7527
7528
7529
7530
7531
7532
7533
7534
7535
7536
7537
7538
....
7676
7677
7678
7679
7680
7681
7682
7683
7684
7685
7686
7687
7688
7689
7690
7691
7692
....
7700
7701
7702
7703
7704
7705
7706
7707
7708
7709
7710
7711
7712
7713
7714
7715
7716
7717
7718
7719
7720
7721
7722
7723
7724
7725
7726
7727
7728
7729
7730
7731
7732
7733
7734
7735
7736
7737
7738
7739
7740
7741
7742
7743
7744
7745
7746
7747
7748
7749
7750
7751
7752
7753
7754
7755
7756
7757
7758
7759
7760
7761
7762
7763
7764
7765
7766
7767
7768
7769
7770
7771
7772
7773
7774
7775
7776
7777
7778
7779
7780
7781
7782
7783
7784
7785
7786
7787
7788
7789
7790
7791
7792
7793
7794
7795
7796
7797
7798
7799
7800
7801
7802
7803
7804
7805
7806
7807
7808
7809
7810
7811
7812
7813
7814
7815
7816
7817
7818
7819
7820
7821
7822
7823
7824
7825
7826
7827
7828
7829
7830
7831
7832
7833
7834
7835
7836
7837
7838
7839
7840
7841
7842
7843
7844
7845
7846
7847
7848
7849
7850
7851
7852
7853
7854
7855
7856
7857
7858
7859
7860
7861
7862
7863
7864
7865
7866
7867
7868
7869
7870
7871
7872
7873
7874
7875
7876
7877
7878
7879
7880
7881
7882
7883
7884
7885
7886
7887
7888
7889
7890
7891
7892
7893
7894
7895
7896
7897
7898
7899
7900
7901
7902
7903
7904
7905
7906
7907
7908
7909
7910
7911
7912
7913
7914
7915
7916
7917
7918
7919
7920
7921
7922
7923
7924
7925
7926
7927
7928
7929
7930
7931
7932
7933
7934
7935
7936
7937
7938
7939
7940
7941
7942
7943
7944
7945
7946
7947
7948
7949
7950
7951
7952
7953
7954
7955
7956
7957
7958
7959
7960
7961
7962
7963
7964
7965
7966
7967
7968
7969
7970
7971
7972
7973
7974
7975
7976
7977
7978
7979
7980
7981
7982
7983
7984
7985
7986
7987
7988
7989
7990
7991
7992
7993
7994
7995
7996
7997
7998
7999
8000
8001
8002
8003
8004
8005
8006
8007
8008
8009
8010
8011
8012
8013
8014
8015
8016
8017
8018
8019
8020
8021
8022
8023
8024
8025
8026
8027
8028
8029
8030
8031
8032
8033
8034
8035
8036
8037
8038
8039
8040
8041
8042
8043
8044
8045
8046
8047
8048
8049
8050
\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
Branch commands
\begin_inset CommandInset label
LatexCommand label
name "fig:Branch-commands"

\end_inset


\end_layout

\end_inset


\end_layout

................................................................................
placement H
wide false
sideways false
status open

\begin_layout Plain Layout
\begin_inset Graphics
	filename Images/Advanced/Branching/branch.epsf
	scale 60

\end_inset


\end_layout

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

\end_layout

\end_inset


\end_layout

\begin_layout Subsubsection
Color Setup
\end_layout

\begin_layout Standard
As you see above the two branches have different colors in the timeline.
 This was due to the 
\series bold
-bgcolor
\series default
 option added when we created each branch.
 (See Figure 
\begin_inset CommandInset ref
LatexCommand ref
reference "fig:Branch-commands"

\end_inset

).
 But we want this color to appear on subsequent checkins of each of these
 branches.
 To make that happen we have to set the options using the UI and picking
 a particular leaf on the timeline.
\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/Branching/color_setup.epsf
	scale 60

\end_inset


\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
Setting Timeline color
\end_layout

\end_inset


\end_layout

\begin_layout Plain Layout

\end_layout

\end_inset


\end_layout

\begin_layout Standard
Under the 
\series bold
Background Color
\series default
 section I have checked 
\series bold
Propagate color to descendants 
\series default
so future checkins will have the same color.
\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
................................................................................
parent:       462156b283b694af0b99c9b446b64d3f77436fbb 2010-06-09 14:16:42
 UTC
\end_layout

\begin_layout LyX-Code

\size footnotesize
tags:         
\series bold
VER_1.0
\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
Check out VER_1.0
................................................................................
parent:       462156b283b694af0b99c9b446b64d3f77436fbb 2010-06-09 14:16:42
 UTC
\end_layout

\begin_layout LyX-Code

\size footnotesize
tags:         
\series bold
VER_2.0
\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
VER_2.0 checkout
................................................................................
\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
Correcting errors (in both)
\end_layout

\begin_layout Standard
After doing this work I found that the main.c file had a warning about an
 unused variable.
 I wanted to correct this in both branches.
 At this point all the files in both branches are the same so correcting
 the file in either branch and copying it to the other is possible.
 I put in a ticket for the change and edit main.c.
 I copy it to both checkouts for the both branches and then check both in.
\end_layout

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

\begin_layout LyX-Code

\size footnotesize
[Pandora-2:jschimpf/Public/jsonp1] jim% 
\series bold
fossil commit -m "[2795e6c74d] Fix unused variable"
\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:        2116         46          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Send:             365          6          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Received:        3601         51          5          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Total network traffic: 805 bytes sent, 3464 bytes received
\end_layout

\begin_layout LyX-Code

\size footnotesize
New_Version: 3b902585d0e8849399286139d27676c5a349de7b
\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:            3034         50          0          2
\end_layout

\begin_layout LyX-Code

\size footnotesize
Received:        2208         48          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Total network traffic: 1848 bytes sent, 1444 bytes received
\end_layout

\begin_layout LyX-Code

\size footnotesize
[Pandora-2:jschimpf/Public/jsonp1] jim% 
\series bold
cd ..
\end_layout

\begin_layout LyX-Code

\size footnotesize
[Pandora-2:/Users/jschimpf/Public] jim% 
\series bold
cd jsonp2
\end_layout

\begin_layout LyX-Code

\size footnotesize
[Pandora-2:jschimpf/Public/jsonp2] jim% 
\series bold
cp ../jsonp1/main.c .
\end_layout

\begin_layout LyX-Code

\size footnotesize
[Pandora-2:jschimpf/Public/jsonp2] 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/jsonp2/
\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 LyX-Code

\size footnotesize
EDITED     main.c
\end_layout

\begin_layout LyX-Code

\size footnotesize
[Pandora-2:jschimpf/Public/jsonp2] jim% 
\series bold
fossil commit -m "[2795e6c74d] Fix unused variable"
\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:        2392         52          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Send:             318          5          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Received:        3320         56          4          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Total network traffic: 781 bytes sent, 3508 bytes received
\end_layout

\begin_layout LyX-Code

\size footnotesize
New_Version: 762a31854d708080678598c8d4ce28465cbee8c5
\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:            3253         55          0          2
\end_layout

\begin_layout LyX-Code

\size footnotesize
Received:        2438         53          0          0
\end_layout

\begin_layout LyX-Code

\size footnotesize
Total network traffic: 1972 bytes sent, 1573 bytes received
\end_layout

\begin_layout LyX-Code

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

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
Fixing both branches
\end_layout

\end_inset


\end_layout

\begin_layout Plain Layout

\end_layout

\end_inset


\end_layout

\begin_layout Standard
Now the timeline looks like 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/Branching/current_state.epsf
	scale 60

\end_inset


\end_layout

\begin_layout Plain Layout
\begin_inset Caption

\begin_layout Plain Layout
Correcting both branches
\end_layout

\end_inset


\end_layout

\begin_layout Plain Layout

\end_layout

\end_inset


\end_layout

\begin_layout Subsubsection
Commands used
\end_layout

\begin_layout Itemize

Changes to fossilbook.pdf.

cannot compute difference between binary files