~ianmdlvl / dgit.git / search
| 2018-06-16 | Ian Jackson | git-debrebase: fix ffq divergence checking (many bugs) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: fix cfg in scalar context (!) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr nmu divergence: do maintainer... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-*: break out t-nmu-causes... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-diverge-nmu-dgit: new... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: lib-gdr: break out some... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: lib-gdr: break out some... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-diverge-nmu: complete Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-diverge-nmu: more work... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-diverge-nmu: add some... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: do not bomb on totally ambiguous pseudomerges Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-diverge-nmu: add a t... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: print more why on Unprocessable commits Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: bomb on totally ambiguous pseudomerges Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-diverge-nmu: new test... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: lib-gdr: introduce t-nmu... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: lib-gdr: move t-nmu-upload... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-viagit: new test Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-import-dgit: test a... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: lib-gdr: add some t-git... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-convert-gbp: use t-dch... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-*: use faketime to control... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-*: add a bunch of calls... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | test suite: Update dummy dates Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-import-dgit: introduce... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-import-dgit: add an... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-import-dgit: move switch... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-import-dgit: move gbp... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-import-dgit: introduce... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-import-dgit: introduce... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: convert-to-gbp: mention commit tag Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: convert-from-gbp: fix usage comment Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: convert-to-gbp: declare it not v0 Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: convert-to-gbp: implementation seems... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: t-gdr-good: test git-debrebase... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: t-gdr-good: split up the... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: provide breakwater command Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: classify: provide Why for Unknown Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: NOTES: avoid merges Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: do not dgit pull (sets a... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: NOTES: about divergence and merges Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: slight message improvements etc. Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: rename gbp2gdr to convert-from-gbp Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: introduce t-make-new-upstream... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: note we've added a test Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-import-dgit: extend Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-import-dgit: extend Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: bugfix Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: drop a superfluous rm_subdir_cached... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: add a missing --quiet to... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: introduce t-gdr-good Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: introduce t-gdr-same-as... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: dgit import: honour $upp_limit Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: DgitImportUnpatched: defer upstream... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: fix Overwritten to be an array like... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-import-dgit: wip Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: introduce t-some-changes Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: introduce t-dch-commit Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-edits: check branch... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gdr-edits: do a push Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gbp2gdr: fix not-gdr-processable... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test suite: gbp2gdr: process incoming Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: NOTES: another todo Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test: check branch structure, more Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test: check branch structure Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: some NOTES Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | test suite: note some todos for gdr-edits Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: stitch better Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: wip stitch Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: record ffq-prev on rebase Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: break out ffq_prev_branchinfo (nfc) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: fix $/ to be local in cfg (!) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | test suite: gdr-edits: more Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: do not add -i in default invocation Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | test suite: gbp2gdr: drop some branches we do not want... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | test suite: gdr-edits: wip new test Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | test suite: gbp2gdr: call t-setup-done Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | test suite: gbp2gdr: drop junk at the end Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | test suite: gbp2gdr: seems to work now Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | test suite: something to have a salsa (general purpose... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: check head is clean before starting Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: use git_rev_parse 'HEAD' for "internal... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: test: use conventional branch names Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: for master branch, check dgit/dgit/sid too Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: bugfixes to record_ffq_prev Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: make cfg optionally take $optional ... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: wip cmd_record_ffq_prev Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: provide record_ffq_prev (no callers... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | debian/control, git-debrebase: "use fnmatch;" Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: introduce --noop-ok Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: notes re ffq-prev ref name Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: intent re record-ffqrebase Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: intent re record-ffrebase Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | test suite: gbp2gdr: use -f<tag> rather than --force Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: provide -f<tag> Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: introduce any_fproblems (nfc) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: introduce tags for fproblems, no use yet Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: more notes Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: note re debrebase push? Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: decide: make few pseudomerges, and preserve... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| next | |||