~ianmdlvl / dgit.git / search
| 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 |
| 2018-06-16 | Ian Jackson | git-debrebase: notes re psuedomerges Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: notes Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: note that we have mostly done the gbp... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: insist that breakwater merges are merges Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: introduce $claims_to_be_breakwater ... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: explain why breakwater bases must be... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: fix misdetection of breakwater declarations... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: rework commit annotations Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: list tags currently written Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | test suite: git-debrebase: turn on debug Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: bugfixes Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | test suite: gbp2gdr: run gdr gbp2debrebase Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: wip gbp2debrebase Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | test suite: initial git-debrebase setup attempts -... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | test suite: initial git-debrebase setup attempts Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | test suite: infrastructure for testing git-debrebase Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: Install it in /usr/bin Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: fix break out fproblem Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: fix several calls to git_cat_file Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: in new-upstream-v0 tolerate planned... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: break out fproblem Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: some notes about gbp import Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: some notes about gbp import Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: docs updates Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: rename NOTES to be more generic |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: provide default rebase action Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: update_head_postlaunder: print a message... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: new-upstream-v0: support passing git... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: new-upstream-v0: use update_head_postlaunder Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: fix changelog manip Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: break out update_head_postlaunder (nfc) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: whitespace Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: new-upstream-v0: use make_commit another... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: new-upstream-v0 break out make_commit Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: new-upstream-v0 bugfixes Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: break out dd (nfc) Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: walk: print some more debug Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: parsecommit: fix confusing wrong handedness... Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: parsecommit: fix Ix to not be off-by-one Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| 2018-06-16 | Ian Jackson | git-debrebase: new-upstream-v0: fixes Signed-off-by: Ian Jackson <ijackson@chiark.greenend.org.uk> |
commit | commitdiff | tree |
| next | |||