On Fri, Jul 22, 2011 at 7:57 AM, Steve Bennett <ste...@workware.net.au>wrote:
> So I created the 'autosetup' branch and added a commit which drh then
> merged to trunk.
>
> Is that branch now defunct? 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?
>
> Just keep adding to the current branch. Or create a new branch with the
same name, autosetup.
Fossil allows multiple short-lived branches with the same name. We use
"experimental" a lot. See, for example:
http://www.sqlite.org/src/timeline?n=400&r=experimental
http://www.fossil-scm.org/fossil/timeline?n=200&r=experimental
To continue using the existing autosetup branch, do this:
fossil update autosetup
# implement and test your changes
fossil commit
To start from trunk and create a new autosetup branch, do this:
fossil update trunk
# implement and test your changes
fossil commit --branch autosetup --bgcolor '#91d680'
The --bgcolor on the last commit is optional. But it is nice to have color
on branches. If you forget it, it can be added later using the Edit feature
of the UI. (That's how I added color to your original autosetup branch).
Note that it is NOT necessary, nor even desirable, to create a branch before
you start adding changes to the branch. You can create the branch when you
do the check in. Or, using the "Edit" button in the UI, you can move a
check-in to a different branch after the fact.
> Thanks,
> Steve
>
> --
> µWeb: Embedded Web Framework - http://uweb.workware.net.au/
> WorkWare Systems Pty Ltd
> W: www.workware.net.au P: +61 434 921 300
> E: ste...@workware.net.au F: +61 7 3391 6002
>
>
>
>
>
> _______________________________________________
> fossil-users mailing list
> fossil-users@lists.fossil-scm.org
> http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
>
--
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
