1
Download Fossil Version Control A Users Guide
Transcript
Fossil Version Control 4.2.3. Fixing the fork So Jim who’s checked out code is from Leaf [1beab85441] does a merge with Marilyn’s leaf [b72e96832e] like so: 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 Figure 4.5.: Merge Operation 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. Next Jim does a commit to make this new merged set of files the new trunk. Rememeber doing the merge shown in Figure 4.5 just updates your checked out code and does not change the repository till you check it in. 558 jsonp> fossil commit -m "After merging in changes" Autosync: http://[email protected]: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://[email protected]: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> Figure 4.6.: Commit after merge When we look at the timeline we have a single leaf for future code commits. Updated for fossil version 1.25 Page 42 of 107
