On Jul 22, 2011, at 13:57 , Steve Bennett wrote: > So I created the 'autosetup' branch and added a commit which drh then merged > to trunk. > > Is that branch now defunct?
If your changes are well integrated into trunk, and you're not continuing development in isolation from trunk, you should close your leaf. This way nobody will get confused and start working from that point. > If I want to propose some more, related changes, > do I create a new branch, say autosetup2, or do I continue or resurrect the > autosetup branch? > If so, how? In Fossil you don't actually close branches. You close commits. Branches are nothing more than a (propagating) tag. You can create a new commit at any point and name it "autosetup", this will render the "autosetup" branch open, as long as there is am open leaf with that tag. See an example here: http://maxnet.org.pl/~lrem/fossil-branching This is an example repository (<60KB) showing a simple scenario with branching, merging, closing and "resurrecting". Kind regards, Remigiusz Modrzejewski _______________________________________________ fossil-users mailing list fossil-users@lists.fossil-scm.org http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
