Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
19 check-ins tagged with "merge-integrate"
|
2013-08-19
| ||
| 14:28 | Don't use a separate Control artifact for "merge --integrate" any more. Closed-Leaf check-in: eb8787a326 user: jan.nijtmans tags: merge-integrate | |
| 13:19 | Use C-card in stead of T-card to put comment on timeline for "merge --integrate" Control artifact. Closed-Leaf check-in: 908a090c88 user: jan.nijtmans tags: merge-integrate | |
|
2013-08-16
| ||
| 14:36 | update documentation Closed-Leaf check-in: d10eee3a4b user: jan.nijtmans tags: merge-integrate | |
| 13:45 | Allow multiple T-cards with the same tags, provided they are for different uuid's which are in strict increasing order. check-in: f2ae58e393 user: jan.nijtmans tags: merge-integrate | |
| 12:44 | If the "+closed" value is an UUID, interpret this as an "fossil merge --integrate" where the uuid is the destination branch of the integration. Closed-Leaf check-in: 4377917005 user: jan.nijtmans tags: merge-integrate | |
|
2013-07-26
| ||
| 08:17 | rebase Closed-Leaf check-in: 2015bbd55d user: jan.nijtmans tags: merge-integrate | |
|
2013-07-24
| ||
| 05:24 | rebase check-in: 072e2b16db user: jan.nijtmans tags: merge-integrate | |
|
2013-07-22
| ||
| 09:23 | rebase check-in: 7b7a4bd579 user: jan.nijtmans tags: merge-integrate | |
| 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 | |