| Message ID | 20161018121356.9594-1-daniel.vetter@ffwll.ch (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
On Tue, 18 Oct 2016, Daniel Vetter <daniel.vetter@ffwll.ch> wrote: > Just maybe a bit more visibility, the scripts are growing. > > Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> LGTM > --- > TODO | 27 +++++++++++++++++++++++++++ > dim | 17 ----------------- > qf | 11 ----------- > 3 files changed, 27 insertions(+), 28 deletions(-) > create mode 100644 TODO > > diff --git a/TODO b/TODO > new file mode 100644 > index 000000000000..ac0f27763dfa > --- /dev/null > +++ b/TODO > @@ -0,0 +1,27 @@ > +dim: > +- extract the integration tree logic and make it generally useful, maybe for a > + drm-integration tree ... > +- Improve nightly-forget to forget a specific merge instead of just the first > + dinq/dif merge. > +- add option to check-patch to check stdin > +- integrate ninja-check? Or too much checkers considered harmful? > + https://lists.linuxfoundation.org/pipermail/ksummit-discuss/2014-May/000554.html > +- add patchwork Link: also after manually resolving conflicts in drm > + apply-resolved > +- pull in dim extract-tags tool from Ville > +- allow dim rebuild-nightly to pull branches from local trees in dry-run mode. > + This is useful to confirm a backmerge is indeed correct, by comparing the > + resulting -nightly with the old one. Current the branch must be pushed out > + first for rebuild-nightly to pick it up, which means the merge can't be > + fixed any more. > + > +qf: > +- get better at preventing and cleaning up a mess when switching branches > + while there's still applied quilt patches around ... > +- combine quilt annotate and git blame into one tool > +- use the index a bit more to e.g. stage all applied quilt patches, then use > + the output of git diff to refresh a quilt patch > +- use git commit-tree and git write-tree in the setup code instead of the > + current high-level hacks > +- track/restore the topmost patch maybe? > +- synchronize quilt notes in qf push and qf fetch > diff --git a/dim b/dim > index 5fb3a0fee7ff..57ad4fcf9767 100755 > --- a/dim > +++ b/dim > @@ -27,23 +27,6 @@ > > # drm-intel-next maintainer script > > -# TODO > -# - extract the integration tree logic and make it generally useful, maybe for a > -# drm-integration tree ... > -# - Improve nightly-forget to forget a specific merge instead of just the first > -# dinq/dif merge. > -# - add option to check-patch to check stdin > -# - integrate ninja-check? Or too much checkers considered harmful? > -# https://lists.linuxfoundation.org/pipermail/ksummit-discuss/2014-May/000554.html > -# - add patchwork Link: also after manually resolving conflicts in drm > -# apply-resolved > -# - pull in dim extract-tags tool from Ville > -# - allow dim rebuild-nightly to pull branches from local trees in dry-run mode. > -# This is useful to confirm a backmerge is indeed correct, by comparing the > -# resulting -nightly with the old one. Current the branch must be pushed out > -# first for rebuild-nightly to pick it up, which means the merge can't be > -# fixed any more. > - > # fail on any goof-up > set -e > > diff --git a/qf b/qf > index 4e9cb03f31fe..31b9f3bae0a2 100755 > --- a/qf > +++ b/qf > @@ -26,17 +26,6 @@ > > # quilt git flow script > > -# TODO > -# - get better at preventing and cleaning up a mess when switching branches > -# while there's still applied quilt patches around ... > -# - combine quilt annotate and git blame into one tool > -# - use the index a bit more to e.g. stage all applied quilt patches, then use > -# the output of git diff to refresh a quilt patch > -# - use git commit-tree and git write-tree in the setup code instead of the > -# current high-level hacks > -# - track/restore the topmost patch maybe? > -# - synchronize quilt notes in qf push and qf fetch > - > # config > QUILT_PREFIX=quilt/
diff --git a/TODO b/TODO new file mode 100644 index 000000000000..ac0f27763dfa --- /dev/null +++ b/TODO @@ -0,0 +1,27 @@ +dim: +- extract the integration tree logic and make it generally useful, maybe for a + drm-integration tree ... +- Improve nightly-forget to forget a specific merge instead of just the first + dinq/dif merge. +- add option to check-patch to check stdin +- integrate ninja-check? Or too much checkers considered harmful? + https://lists.linuxfoundation.org/pipermail/ksummit-discuss/2014-May/000554.html +- add patchwork Link: also after manually resolving conflicts in drm + apply-resolved +- pull in dim extract-tags tool from Ville +- allow dim rebuild-nightly to pull branches from local trees in dry-run mode. + This is useful to confirm a backmerge is indeed correct, by comparing the + resulting -nightly with the old one. Current the branch must be pushed out + first for rebuild-nightly to pick it up, which means the merge can't be + fixed any more. + +qf: +- get better at preventing and cleaning up a mess when switching branches + while there's still applied quilt patches around ... +- combine quilt annotate and git blame into one tool +- use the index a bit more to e.g. stage all applied quilt patches, then use + the output of git diff to refresh a quilt patch +- use git commit-tree and git write-tree in the setup code instead of the + current high-level hacks +- track/restore the topmost patch maybe? +- synchronize quilt notes in qf push and qf fetch diff --git a/dim b/dim index 5fb3a0fee7ff..57ad4fcf9767 100755 --- a/dim +++ b/dim @@ -27,23 +27,6 @@ # drm-intel-next maintainer script -# TODO -# - extract the integration tree logic and make it generally useful, maybe for a -# drm-integration tree ... -# - Improve nightly-forget to forget a specific merge instead of just the first -# dinq/dif merge. -# - add option to check-patch to check stdin -# - integrate ninja-check? Or too much checkers considered harmful? -# https://lists.linuxfoundation.org/pipermail/ksummit-discuss/2014-May/000554.html -# - add patchwork Link: also after manually resolving conflicts in drm -# apply-resolved -# - pull in dim extract-tags tool from Ville -# - allow dim rebuild-nightly to pull branches from local trees in dry-run mode. -# This is useful to confirm a backmerge is indeed correct, by comparing the -# resulting -nightly with the old one. Current the branch must be pushed out -# first for rebuild-nightly to pick it up, which means the merge can't be -# fixed any more. - # fail on any goof-up set -e diff --git a/qf b/qf index 4e9cb03f31fe..31b9f3bae0a2 100755 --- a/qf +++ b/qf @@ -26,17 +26,6 @@ # quilt git flow script -# TODO -# - get better at preventing and cleaning up a mess when switching branches -# while there's still applied quilt patches around ... -# - combine quilt annotate and git blame into one tool -# - use the index a bit more to e.g. stage all applied quilt patches, then use -# the output of git diff to refresh a quilt patch -# - use git commit-tree and git write-tree in the setup code instead of the -# current high-level hacks -# - track/restore the topmost patch maybe? -# - synchronize quilt notes in qf push and qf fetch - # config QUILT_PREFIX=quilt/
Just maybe a bit more visibility, the scripts are growing. Signed-off-by: Daniel Vetter <daniel.vetter@intel.com> --- TODO | 27 +++++++++++++++++++++++++++ dim | 17 ----------------- qf | 11 ----------- 3 files changed, 27 insertions(+), 28 deletions(-) create mode 100644 TODO