One more thing I think is necessary to mostly eliminate the confusion. Currently "fossil branch new BRANCHNAME" is not followed by an automatic "fossil update BRANCHNAME". This I think will be surprising when the user goes to do their first "fossil commit" thinking they are committing to the branch they just opened.
On Mon, Feb 6, 2017 at 2:08 PM, john lunzer <lun...@gmail.com> wrote: > Haha, please disregard my previous message. You posted while I was still > typing the other. Your action will mostly take care of the issue. Thank you > for considering my situation. > > If I may ask though, if autosync is off how would the situation of two > developers creating a branch by the same name and then manually syncing to > a repo play out? > > On Mon, Feb 6, 2017 at 1:40 PM, Richard Hipp <d...@sqlite.org> wrote: > >> On 2/6/17, bch <brad.har...@gmail.com> wrote: >> > I haven't ever run into this issue, but what you're wondering about >> sounds >> > reasonable on the surface. "Principle of least surprise", and all... >> > >> >> The trunk version of Fossil will now only permit the --branch option >> on a "fossil commit" if the named branch either does not exist or is >> closed or the --force flag is used. >> >> It turns out the "fossil branch new" command was already configured to >> fail if the branch already existed. The "fossil branch new" command >> is more restrictive in that it does not allow a --force option and it >> refuses to create a new branch with an existing name even if the >> existing branch is closed. >> >> The existing "branch list" shows branches as closed if their most >> recent check-in is closed. But there could still be older leaf >> check-ins that are open on that branch. This is the case for the >> "experimental" branch which as an old open leaf at >> https://www.fossil-scm.org/fossil/timeline?c=b21df7ec - the new >> "fossil branch info" command is more exacting and shows this branch as >> being open and identifies the check-in that is holding it open. >> >> Developer policy: Let's keep the [b21df7ec] check-in open as a test >> case for branches where recent leaves are closed but there exists an >> older leaf that is still open. >> >> -- >> D. Richard Hipp >> d...@sqlite.org >> _______________________________________________ >> fossil-users mailing list >> fossil-users@lists.fossil-scm.org >> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users >> > >
_______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
