See the transcript below for gory details. The summary is: 1. create a new file on trunk and check it in. 2. edit the file and check in on a branch (let's call it "beta") 3. trunk decides it wants that particular change set from step (2), so cherrypick it (assume in this example that other stuff is happening on the beta branch that we don't want in trunk at the moment, so a normal merge is not appropriate). 4. edit the same file on trunk and check it in 5. the "beta" branch now wants to merge the latest from trunk to continue work
==> It's noted as a merge conflict This is because the GCA calculation does not seem to incorporate the cherrypick info (at least in this case). Perhaps there is some deeper reason for this that I'm unaware of, but for this case the behavior is suboptimal. Transcript illustrating the above: eas@little:~$ fossil version This is fossil version 1.33 [9c65b5432e] 2015-05-23 11:11:31 UTC eas@little:~$ mkdir /tmp/fossil eas@little:~$ cd !$ cd /tmp/fossil eas@little:/tmp/fossil$ fossil new test.db project-id: c3037e9c81eb4c3279dfc24f07579bfbe604ddee server-id: ba2bb96bf830fa680389b425fa09c5dcfd5370c2 admin-user: eas (initial password is "dc73fc") eas@little:/tmp/fossil$ mkdir sandbox eas@little:/tmp/fossil$ cd !$ cd sandbox eas@little:/tmp/fossil/sandbox$ fossil open /tmp/fossil/test.db project-name: <unnamed> repository: /tmp/fossil/test.db local-root: /tmp/fossil/sandbox/ config-db: /home/eas/.fossil project-code: c3037e9c81eb4c3279dfc24f07579bfbe604ddee checkout: 6bb0b6577411bd798631d137bf5b2d7d8fc3ac12 2015-09-14 15:28:16 UTC tags: trunk comment: initial empty check-in (user: eas) check-ins: 1 eas@little:/tmp/fossil/sandbox$ echo 1.0 > VERSION eas@little:/tmp/fossil/sandbox$ fossil add VERSION ADDED VERSION eas@little:/tmp/fossil/sandbox$ fossil commit -m "Add version file" New_Version: b6f302b927b0289feae9831c80f8b066f6e87d70 eas@little:/tmp/fossil/sandbox$ echo 1.1 > h^CRSION eas@little:/tmp/fossil/sandbox$ set -o vi eas@little:/tmp/fossil/sandbox$ echo 1.1b1 > VERSION eas@little:/tmp/fossil/sandbox$ fossil commit --branch beta -m "Start beta branch." New_Version: ac64ec791f7be8601848e4c50a87dc54262cc659 eas@little:/tmp/fossil/sandbox$ fossil update trunk UPDATE VERSION ------------------------------------------------------------------------------- updated-to: b6f302b927b0289feae9831c80f8b066f6e87d70 2015-09-14 15:28:52 UTC tags: trunk comment: Add version file (user: eas) changes: 1 file modified. "fossil undo" is available to undo changes to the working checkout. eas@little:/tmp/fossil/sandbox$ fossil merge --cherrypick ac64ec791f7be8601848e4c50a87dc54262cc659 UPDATE VERSION "fossil undo" is available to undo changes to the working checkout. eas@little:/tmp/fossil/sandbox$ eas@little:/tmp/fossil/sandbox$ fossil commit -m "Cherrypick version number change." New_Version: 8a4693e6ce2faa5cf3cd1e5a839b33ba7c590d02 eas@little:/tmp/fossil/sandbox$ echo 1.1b1.01 > VERSION eas@little:/tmp/fossil/sandbox$ fossil commit -m "More work on the trunk." New_Version: cee15c31915298ecce84eb0b5aa9b7520e3c8b61 eas@little:/tmp/fossil/sandbox$ fossil update beta UPDATE VERSION ------------------------------------------------------------------------------- updated-to: ac64ec791f7be8601848e4c50a87dc54262cc659 2015-09-14 15:29:19 UTC tags: beta comment: Start beta branch. (user: eas) changes: 1 file modified. "fossil undo" is available to undo changes to the working checkout. eas@little:/tmp/fossil/sandbox$ fossil merge trunk MERGE VERSION ***** 1 merge conflicts in VERSION WARNING: 1 merge conflicts "fossil undo" is available to undo changes to the working checkout. eas@little:/tmp/fossil/sandbox$ cat VERSION <<<<<<< BEGIN MERGE CONFLICT: local copy shown first <<<<<<<<<<<<<<< 1.1b1 ======= COMMON ANCESTOR content follows ============================ 1.0 ======= MERGED IN content follows ================================== 1.1b1.01 >>>>>>> END MERGE CONFLICT >>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>> eas@little:/tmp/fossil/sandbox$ exit
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
