summaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAge
* git-debrebase(5): copy more stuff from READMEIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase(5): wip, converting from READMEIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: NOTES: tidying upIan Jackson2018-06-16
|
* git-debrebase: NOTES: record gbp import work doneIan Jackson2018-06-16
|
* git-debrebase: NOTES: reword, record decisions about pm and ffq, tidyIan Jackson2018-06-16
|
* git-debrebase: NOTES: reword to record decisions about pm and ffq handlingIan Jackson2018-06-16
|
* git-debrebase: test suite: add some t-git-next-dateIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: test --anchor optionIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: provide --anchor optionIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: gdr-newupstream-v0: omit upstreamIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: new-upstream-v0: allow upstream to be omittedIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: gdr-newupstream-v0: new testIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: new-upstream-v0: call record_ffq_auto (nfc)Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: introduce record_ffq_auto (nfc)Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: NOTES: a todoIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: renmae $old_upstream_update* to $old_anchor* (nfc)Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: do remaining ref update atomicallyIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: do most ref updates together, atomicallyIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: t-gdr-good: fix commentIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: test ff stitchingIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: stitch: add an update-ref messageIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: stitch: ff when possibleIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: be properly selective about StartRewriteIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: spot any pointless pseudomergesIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: spot any merges which have multiple identical parentsIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Rename `launder' to `launder-v0'Ian Jackson2018-06-16
| | | | | | | This command is too raw, really, and we may want that name for something else (eg, rebase and stitch). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Recognise anchors by commit annotation, onlyIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Recognise anchors by commit annotationIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: docs etc.: Intend to recognise anchors by commit annotationIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: README: change diagrams to use @ for anchorIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: Introduce term `anchor'Ian Jackson2018-06-16
| | | | | | | And replace `breakwater merge' and `breakwater upstream merge' everywhere. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: NOTES: done test suite, pretty muchIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: gdr nmu divergence: check that divergence check ↵Ian Jackson2018-06-16
| | | | | | trips on nmus Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: fix ffq divergence checking (many bugs)Ian Jackson2018-06-16
| | | | | | Also add some debugging to ffq checking Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: fix cfg in scalar context (!)Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: gdr nmu divergence: do maintainer firstIan Jackson2018-06-16
| | | | | | | | In practical terms this is needed because we are only using one tree, and otherwise the nmu's dgit push will update dgit/dgit/sid, causing the ffq check to fail (when we fix it, in a moment). Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: gdr-*: break out t-nmu-causes-ff-failIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: gdr-diverge-nmu-dgit: new testIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: lib-gdr: break out some more t-*Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: lib-gdr: break out some more t-*Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: gdr-diverge-nmu: completeIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: gdr-diverge-nmu: more work, still need to checkIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: gdr-diverge-nmu: add some t-git-next-dateIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: do not bomb on totally ambiguous pseudomergesIan Jackson2018-06-16
| | | | | | | Actually, we want `git-merge -s ours' (or `git-debrebase stitch') to be comprehended. We sacrifice `git-merge -s theirs'. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: gdr-diverge-nmu: add a t-git-next-dateIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: print more why on Unprocessable commitsIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: bomb on totally ambiguous pseudomergesIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: gdr-diverge-nmu: new test, not complete yetIan Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: lib-gdr: introduce t-nmu-upload-3Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>
* git-debrebase: test suite: lib-gdr: move t-nmu-upload-[12]Ian Jackson2018-06-16
| | | | Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk>