Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
10 descendants and 10 ancestors of b984ecaf1d4e730e
|
2013-07-22
| ||
| 07:52 | Fix bug. ... (check-in: c9ee3ff674 user: jan.nijtmans tags: merge-integrate) | |
| 07:42 | A few more places where the "chnged" field values 4 and 5 have effect ... (check-in: 530ef9557b user: jan.nijtmans tags: merge-integrate) | |
| 07:09 | Add "fossil status" markers for UPDATED_BY_INTEGRATE and ADDED_BY_INTEGRATE ... (check-in: e9ffc05c0b user: jan.nijtmans tags: merge-integrate) | |
|
2013-07-14
| ||
| 15:52 | Documentation ... (check-in: d1865e7ca1 user: jan.nijtmans tags: merge-integrate) | |
| 14:56 | Rebase. Use -4 as INTEGRATE tag, not -3 ... (check-in: 967ef5f7c5 user: jan.nijtmans tags: merge-integrate) | |
|
2013-07-12
| ||
| 14:26 | typo ... (check-in: 011a4ad1eb user: jan.nijtmans tags: merge-integrate) | |
| 11:33 | rebase ... (check-in: a745092fbc user: jan.nijtmans tags: merge-integrate) | |
| 08:05 | In case of a dry-run, output manifest before printing other information about the merge. ... (check-in: 72713b7d66 user: jan.nijtmans tags: merge-integrate) | |
| 07:58 | Minor tweaks in error/warning messages. Well-tested now. ... (check-in: 5f4b03ebf0 user: jan.nijtmans tags: merge-integrate) | |
|
2013-07-11
| ||
| 15:20 | Implementation complete. Should be thorougly tested now. ... (check-in: 491dd37970 user: jan.nijtmans tags: merge-integrate) | |
| 08:47 | Implement "fossil merge --integrate" as suggested by Harald Oehlmann. The only part missing is the actual closing of the branch. ... (check-in: b984ecaf1d user: jan.nijtmans tags: merge-integrate) | |
|
2013-07-10
| ||
| 10:10 | Only set "seen-delta-manifest" once. ... (check-in: 18d762af88 user: jan.nijtmans tags: trunk) | |
|
2013-07-09
| ||
| 11:52 | Update to the latest 3.8.0 alpha version of SQLite. ... (check-in: 5ea03d389d user: drh tags: trunk) | |
| 08:51 | Fix "fossil commit" when specifying a directory on the command line which doesn't exist. ... (check-in: 062b82c8b0 user: jan.nijtmans tags: trunk) | |
|
2013-07-05
| ||
| 12:06 | Fix behavior of "fossil commit" on case-insensitive file systems. ... (check-in: c1611f7dfa user: jan.nijtmans tags: trunk) | |
| 06:46 | Fix [8ee231223d]: fossil ls --age --verbose ignores --verbose ... (check-in: 40d152478a user: jan.nijtmans tags: trunk) | |
|
2013-07-04
| ||
| 19:11 | Help text fixes from Andreas Kupries. ... (check-in: f6ad6979d7 user: stephan tags: trunk) | |
|
2013-06-29
| ||
| 15:41 | Fix the build on windows by using "_pclose" instead of "pclose". ... (check-in: 07463fbf02 user: drh tags: trunk) | |
| 15:26 | Bring in the latest SQLite 3.8.0 alpha version from upstream, for testing. ... (check-in: c3e723e308 user: drh tags: trunk) | |
|
2013-06-27
| ||
| 18:34 | Added missing ?-global? hint in one instance of the settings command help. ... (check-in: 8dc6873d44 user: stephan tags: trunk) | |
| 14:23 | fixed a typo: s/favors/flavors/ (which arguably should be "flavours" ;) ... (check-in: 7b011abe84 user: stephan tags: trunk) | |