Fossil with Commonmark

Check-in [604a355811]
Login

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Overview
Comment:c/--force/--allow-fork/
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA1:604a355811f04b022e9bd38fe1d24791ae882842
User & Date: jan.nijtmans 2014-07-10 08:21:12
Context
2014-07-10
10:01
./src/comformat.c: In function ‘comment_print’: ./src/comformat.c:70:5: warning: implicit declaration of function ‘ioctl’ [-Werror=implicit-function-declaration] if( ioctl(0, TIOCGWINSZ, &w)!=-1 ){ ^ check-in: 32205fdc41 user: jan.nijtmans tags: trunk
09:25
merge trunk check-in: a44b4aa5ac user: jan.nijtmans tags: undo-clean
08:21
c/--force/--allow-fork/ check-in: 604a355811 user: jan.nijtmans tags: trunk
08:18
Since fossil 1.29, not every repository has an initial commit and the initial commit no longer needs to be empty. Change the wording to account for that. check-in: aafcf6c57b user: jan.nijtmans tags: trunk
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to www/branching.wiki.

61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
works. This is also how fossil works in [./concepts.wiki#workflow |
"autosync"] mode.

But perhaps Bob is off-network when he does his commit, so he
has no way of knowing that Alice has already committed her changes.
Or, it could be that Bob has turned off "autosync" mode in Fossil.  Or,
maybe Bob just doesn't want to merge in Alice's changes before he has
saved his own, so he forces the commit to occur using the "--force" option
to the fossil <b>commit</b> command.  For any of these reasons, two commits against
check-in 2 have occurred and now the DAG has two leaves.

So which version of the project is the "latest" in the sense of having
the most features and the most bug fixes?  When there is more than
one leaf in the graph, you don't really know.  So we like to have
graphs with a single leaf.

To resolve this situation, Alice can use the fossil <b>merge</b> command







|
|
|







61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
works. This is also how fossil works in [./concepts.wiki#workflow |
"autosync"] mode.

But perhaps Bob is off-network when he does his commit, so he
has no way of knowing that Alice has already committed her changes.
Or, it could be that Bob has turned off "autosync" mode in Fossil.  Or,
maybe Bob just doesn't want to merge in Alice's changes before he has
saved his own, so he forces the commit to occur using the "--allow-fork"
option to the fossil <b>commit</b> command.  For any of these reasons,
two commits against check-in 2 have occurred and now the DAG has two leaves.

So which version of the project is the "latest" in the sense of having
the most features and the most bug fixes?  When there is more than
one leaf in the graph, you don't really know.  So we like to have
graphs with a single leaf.

To resolve this situation, Alice can use the fossil <b>merge</b> command