| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Split merge tests out from the other branching tests | Sam Thursfield | 2012-10-29 | 1 | -1/+0 |
| | | | | | Merge is by far the most complex of the branching and merging commands. | ||||
| * | morph merge: Rework how we interact with git | Sam Thursfield | 2012-10-03 | 1 | -1/+1 |
| | | | | | | | | | | | | | | Upsides: - clearer error messages on conflicts (we no longer dump the git output) - merge base is available during morphology merging - we no longer need to go through the complexity of implementing a git merge driver We now manually fetch and then merge, instead of using git pull. This is not strictly necessary, but it makes it clearer in the code how FETCH_HEAD is involved in the process. | ||||
| * | tests.branching: Add complex merge tests | Sam Thursfield | 2012-09-17 | 1 | -0/+1 |
| * Spot completely unmergable cases * Make sure that changes in a chunk repo are merged to the back to that chunk's original ref, which is not necessarily the same as the TO system branch. * Test renaming a chunk (works fine if repo is the same) * Try adding a new chunk or stratum and editing it too. | |||||
 |
index : baserock/baserock/morph.git | |
| Morph -- Baserock build tool |
| summaryrefslogtreecommitdiff |