Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| Comment: | Fix typos in the privatebranch document. |
|---|---|
| Timelines: | family | ancestors | descendants | both | trunk |
| Files: | files | file ages | folders |
| SHA1: |
dea8397e9a16b1f654c7b8b68c5885c0 |
| User & Date: | drh 2009-06-08 12:57:47 |
Context
|
2009-06-08
| ||
| 12:57 | Fix typos in the privatebranch document. check-in: dea8397e9a user: drh tags: trunk | |
| 06:23 | Add a few lines to btreemodule.html. check-in: 982ca6b660 user: dan tags: trunk | |
| 04:45 | Update datatype3.html to mention that CAST expressions have an affinity. check-in: 0b44acac20 user: dan tags: trunk | |
Changes
Changes to pages/privatebranch.in.
67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 |
maintainer makes an exact copy of the the baseline SQLite into the branch space, shown as version (2). Note that (1) and (2) are exactly the same. Then the maintainer applies the private changes to version (2) resulting in version (3). In other words, version (3) is SQLite version 3.6.15 plus edits.</p> <p>Later, SQLite version 3.6.15 is released, as shown by circle (4) in the diagram. At the point, the private branch maintainer does a merge which takes all of the changes going from (1) to (4) and applies those changes to (3). The result is version (5), which is SQLite 3.6.12 plus edits.</p> <p>There might be merge conflicts. In other words, it might be that the changes from (2) to (3) are incompatible with the changes from (1) to (4). In that case, the maintainer will have to manually resolve the conflicts. Hopefully conflicts will not come up that often. Conflicts are less likely to |
| | |
67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 |
maintainer makes an exact copy of the the baseline SQLite into the branch space, shown as version (2). Note that (1) and (2) are exactly the same. Then the maintainer applies the private changes to version (2) resulting in version (3). In other words, version (3) is SQLite version 3.6.15 plus edits.</p> <p>Later, SQLite version 3.6.16 is released, as shown by circle (4) in the diagram. At the point, the private branch maintainer does a merge which takes all of the changes going from (1) to (4) and applies those changes to (3). The result is version (5), which is SQLite 3.6.16 plus edits.</p> <p>There might be merge conflicts. In other words, it might be that the changes from (2) to (3) are incompatible with the changes from (1) to (4). In that case, the maintainer will have to manually resolve the conflicts. Hopefully conflicts will not come up that often. Conflicts are less likely to |