Thus said to...@acm.org on Sat, 30 May 2015 01:29:10 +0300: > As to what happened you probably guessed right. I must have used the > --branch option from within the 'mistake' branch. I was (until just > now) under the impression that the --branch option either starts a new > branch (if the name given is not already a branch), or commits against > that branch if it already exists.
Keep in mind that a checkin must go against the current checkout that you are at in your repository. Even if you give it --branch, the parent for the checkin will still be your current node, not the tip of some other branch that might exist. So, if you make changes to trunk, use --branch NAME to checkin and then do more work on trunk and again use --branch NAME when you checkin, they will have the same ``branch'' tag by the name of NAME, but in the timeline, there will not be a direct lineage from the first checkin to the second on the ``branch.'' So, to address your last statement, ``[--branch] commits against that branch if it already exists'' it does, however, perhaps not in the way you might think. It does not magically update your checkout to the tip of the named branch if it exists. It simply starts a new named fork with the branch name given, even if the same name already exists. Does that help? Thanks, Andy -- TAI64 timestamp: 400000005568ffc8 _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
