On 4/29/2017 7:49 PM, jungle boogie wrote:
On 04/29/2017 02:07 PM, The Tick wrote:
Is there any page that describes "branch", "trunk", "leaf", etc.?
See if this page helps:
http://fossil-scm.org/index.html/doc/trunk/www/branching.wiki
Thank you, that certainly helps some.
I wish it had shown me the fossil command lines used for the various
commits.
I can't figure out how to tell fossil to commit against a specific
branch -- it always takes the last version of a file to compute the diffs.
If I have a project as a sole developer, I can see how I can do:
f commit
make changes
f commit
make changes
f commit
etc.
At some point I call it a release. I want to branch off version 2 and
develop that. If I find a bug that needs to be added to the release
branch, I want to continue down that path -- the fix may never even
apply to version 2. So I want something like figure 4 except there are
no merges and "test" would be called "release 2".
I tried the -branch and the -tag options to "f commit" but I'm not
getting what I expect.
What would be the sequence of fossil commands to produce figure 4
(without merges), and then what would be the two fossil commands to
commit changes to each branch (say for "file.c")?
I'm probably misunderstanding something very basic.
_______________________________________________
fossil-users mailing list
fossil-users@lists.fossil-scm.org
http://lists.fossil-scm.org:8080/cgi-bin/mailman/listinfo/fossil-users
