Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Enhance the title for the /finfo page when the ubg query parameter is present. Use the ubg query parameter for the document history link on the rebaseharm.md page. |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA3-256: |
80f982518b4e33e074693e7f55ec58a0 |
| User & Date: | drh 2019-09-13 12:40:12 |
Context
|
2019-09-13
| ||
| 12:48 | Rewrote the "One vs. Many Check-outs per Repository" section in fossil-v-git.wiki to focus more on default modes of operation and their consequences in response to nit-picking on the Lobste.rs thread about this article pointing out that you can make Git work in the Fossil style. Defaults matter. check-in: 10a57cec user: wyoung tags: trunk | |
| 12:40 | Enhance the title for the /finfo page when the ubg query parameter is present. Use the ubg query parameter for the document history link on the rebaseharm.md page. check-in: 80f98251 user: drh tags: trunk | |
| 12:00 | Added paragraph on feedback loops, control theory, and OODA to the fossil-v-git doc, distilling a recent discussion on the forum. check-in: b0f2a48f user: wyoung tags: trunk | |
Changes
Changes to src/finfo.c.
451 452 453 454 455 456 457 458 459 460 461 462 463 464 |
fossil_free(zUuid);
}
}else{
blob_appendf(&title, "History of ");
hyperlinked_path(zFilename, &title, 0, "tree", "");
if( fShowId ) blob_appendf(&title, " (%d)", fnid);
}
@ <h2>%b(&title)</h2>
blob_reset(&title);
pGraph = graph_init();
@ <table id="timelineTable%d(iTableId)" class="timelineTable">
if( baseCheckin ){
db_prepare(&qparent,
"SELECT DISTINCT pid FROM mlink"
|
> > > |
451 452 453 454 455 456 457 458 459 460 461 462 463 464 465 466 467 |
fossil_free(zUuid);
}
}else{
blob_appendf(&title, "History of ");
hyperlinked_path(zFilename, &title, 0, "tree", "");
if( fShowId ) blob_appendf(&title, " (%d)", fnid);
}
if( uBg ){
blob_append(&title, " (color-coded by user)", -1);
}
@ <h2>%b(&title)</h2>
blob_reset(&title);
pGraph = graph_init();
@ <table id="timelineTable%d(iTableId)" class="timelineTable">
if( baseCheckin ){
db_prepare(&qparent,
"SELECT DISTINCT pid FROM mlink"
|
Changes to www/rebaseharm.md.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 |
# Rebase Considered Harmful
Fossil deliberately omits a "rebase" command, because the original
designer of Fossil (and [original author][vhist] of this article) considers rebase to be
an anti-pattern to be avoided. This article attempts to
explain that point of view.
[vhist]: https://fossil-scm.org/fossil/finfo?name=www/rebaseharm.md
## 1.0 Rebasing is dangerous
Most people, even strident advocates of rebase, agree that rebase can
cause problems when misused. The Git rebase documentation talks about the
[golden rule of rebase][golden]: that it should never be used on a public
branch. Horror stories of misused rebase abound, and the rebase
|
| |
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 |
# Rebase Considered Harmful
Fossil deliberately omits a "rebase" command, because the original
designer of Fossil (and [original author][vhist] of this article) considers rebase to be
an anti-pattern to be avoided. This article attempts to
explain that point of view.
[vhist]: /finfo?name=www/rebaseharm.md&ubg
## 1.0 Rebasing is dangerous
Most people, even strident advocates of rebase, agree that rebase can
cause problems when misused. The Git rebase documentation talks about the
[golden rule of rebase][golden]: that it should never be used on a public
branch. Horror stories of misused rebase abound, and the rebase
|